merge-recursive: make "CONFLICT (rename/delete)" message show both paths

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index d84897a67a3c365e280f88b36f43fc49e1ac9d7b..0d8d893090e18af677b8c63b19c30c574b237ac9 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -155,6 +155,15 @@ test_expect_success 'amend --only ignores staged contents' '
        git diff --exit-code
 '
 
+test_expect_success 'allow-empty --only ignores staged contents' '
+       echo changed-again >file &&
+       git add file &&
+       git commit --allow-empty --only -m "empty" &&
+       git cat-file blob HEAD:file >file.actual &&
+       test_cmp file.expect file.actual &&
+       git diff --exit-code
+'
+
 test_expect_success 'set up editor' '
        cat >editor <<-\EOF &&
        #!/bin/sh