Merge branch 'zk/difftool-counts'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Dec 2013 22:58:13 +0000 (14:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Dec 2013 22:58:13 +0000 (14:58 -0800)
commit6904f9a...5ba7666cdb5390733225e123fe25526b
tree7867aa3...3189903c8075c16abc35163f6de07243copy hash to clipboard (tree)
parent604ada4...5b78a473baa6962a90def78ccb186c58copy hash to clipboard (diff)
parent0ea7d5b...f8e258fdec067edf1b136ed87c5670e5copy hash to clipboard (diff)
Documentation/git.txt
diff.c
diff.h