Junio C Hamano a613b534bc 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

2011-05-13 10:41:54 -07:00

14 KiB

Raw Blame History

View Raw