Merge branch 'jc/fix-diff-files-unmerged' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:54 +0000 (10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:54 +0000 (10:41 -0700)
commita613b53...bca2d56f2ad67b3a7f0cf2b34f031260
tree2a54a3d...666577bf01234e5771e16dec7ccb240dcopy hash to clipboard (tree)
parent4bdbfb1...b2d2ad1fbe144dcde386e71bcdff91d0copy hash to clipboard (diff)
parent095ce95...8b738db28d5e9a6e05d94c7e3f55f39dcopy hash to clipboard (diff)
diff-lib.c
diff.c
diff.h
t/t1400-update-ref.sh
t/t1501-worktree.sh
t/t3200-branch.sh
t/t3600-rm.sh
t/t4002-diff-basic.sh
t/t4027-diff-submodule.sh
t/t7012-skip-worktree-writing.sh
t/test-lib.sh