Merge branch 'mp/diff-algo-config'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2013 23:25:51 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2013 23:25:52 +0000 (15:25 -0800)
commitabea4dc...6a675d4ac0f27a2367256dc31981d1ca
tree07020df...6fce37c742bc73700d651e117891a416copy hash to clipboard (tree)
parentadbbc6f...9121aee3aec383a9ac05092c79908033copy hash to clipboard (diff)
parent07924d4...50e5304fb53eb60aaba8aef31d4c4e5ecopy hash to clipboard (diff)
Documentation/diff-config.txt
Documentation/diff-options.txt
contrib/completion/git-completion.bash
diff.c
diff.h