Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:32:50 +0000 (20:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:32:50 +0000 (20:32 -0700)
commitdde4af4...13c6fba5269df384d97ef4fa3ab5971d
tree0441889...f594719be3e4e6f6b7e2234171218fb6copy hash to clipboard (tree)
parentaf9ce1f...c6de9774e90a91f27fb1febd027f74f1copy hash to clipboard (diff)
parent45d9414...a5599b41578625961b53e18a9b9148c7copy hash to clipboard (diff)
13 files changed:
Documentation/gitattributes.txt
Makefile
builtin-checkout.c
builtin-commit-tree.c
builtin-fetch-pack.c
builtin-update-index.c
combine-diff.c
diff.c
git-svn.perl
t/t7201-co.sh
t/t9700/test.pl
xdiff-interface.c
xdiff-interface.h