Merge branch 'jc/fix-diff-files-unmerged'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:58 +0000 (10:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:58 +0000 (10:52 -0700)
commit22dbeee...15e4c9fae3e3fdc1f3a2c4a6ec90e593
tree0091b83...de88064187f0ddfd637b8ff93883ededcopy hash to clipboard (tree)
parent6c252ef...9e314eef8fca862cca8a63329fa7591ccopy 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