summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-27 22:58:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-27 22:58:13 (GMT)
commit6904f9aa5ba7666cdb5390733225e123fe25526b (patch)
tree7867aa393189903c8075c16abc35163f6de07243 /builtin
parent604ada435b78a473baa6962a90def78ccb186c58 (diff)
parent0ea7d5b6f8e258fdec067edf1b136ed87c5670e5 (diff)
downloadgit-6904f9aa5ba7666cdb5390733225e123fe25526b.zip
git-6904f9aa5ba7666cdb5390733225e123fe25526b.tar.gz
git-6904f9aa5ba7666cdb5390733225e123fe25526b.tar.bz2
Merge branch 'zk/difftool-counts'
Show the total number of paths and the number of paths shown so far when "git difftool" prompts to launch an external diff tool, which would give users some sense of progress. * zk/difftool-counts: diff.c: fix some recent whitespace style violations difftool: display the number of files in the diff queue in the prompt
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions