Junio C Hamano 22dbeee715 Merge branch 'jc/fix-diff-files-unmerged' ...

* 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-06 10:52:58 -07:00

14 KiB

Raw Blame History

View Raw