| commit | a613b534bca2d56f2ad67b3a7f0cf2b34f031260 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:41:54 +0000 (13 10:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:41:54 +0000 (13 10:41 -0700) | ||
| tree | 2a54a3d0666577bf01234e5771e16dec7ccb240d | treesnapshot (tar.gz zip) |
| parent | 4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0 | commitdiff |
| parent | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d | commitdiff |
Merge branch 'jc/fix-diff-files-unmerged' into maint
* jc/fix-diff-files-unmerged:
diff-files: show unmerged entries correctly
diff: remove often unused parameters from diff_unmerge()
diff.c: return filepair from diff_unmerge()
test: use $_z40 from test-lib
* jc/fix-diff-files-unmerged:
diff-files: show unmerged entries correctly
diff: remove often unused parameters from diff_unmerge()
diff.c: return filepair from diff_unmerge()
test: use $_z40 from test-lib