• Junio C Hamano's avatar
    Merge branch 'jc/fix-diff-files-unmerged' · 22dbeee7
    Junio C Hamano authored
    * 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
    22dbeee7
t7012-skip-worktree-writing.sh 3.29 KB