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

diff --cc diff-lib.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc t/t1400-update-ref.sh
Simple merge

diff --cc t/t1501-worktree.sh
Simple merge

diff --cc t/t3200-branch.sh
index 286a2a68692dd7a70e34851f75098506a1fc783a,4c4cff19634546d37b956dadbe9306db15ecbde4..463ef1909f5e31be078f504546f5ea8ab3154d3c
--- 1/t/t3200-branch.sh
--- 2/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -223,14 -212,9 +223,14 @@@ test_expect_success 
      'branch from non-branch HEAD w/--track causes failure' \
      'test_must_fail git branch --track my10 HEAD^'
  
 +test_expect_success \
 +    'branch from tag w/--track causes failure' \
 +    'git tag foobar &&
 +     test_must_fail git branch --track my11 foobar'
 +
  # Keep this test last, as it changes the current branch
  cat >expect <<EOF
- 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000    branch: Created from master
+ $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000       branch: Created from master
  EOF
  test_expect_success \
      'git checkout -b g/h/i -l should create a branch and a log' \

diff --cc t/t3600-rm.sh
Simple merge

diff --cc t/t4002-diff-basic.sh
Simple merge

diff --cc t/t4027-diff-submodule.sh
Simple merge

diff --cc t/t7012-skip-worktree-writing.sh
Simple merge

diff --cc t/test-lib.sh
Simple merge