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

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 45d228ebc81ed13c83d24f90895e9a374af5a87e..7171f67539bfafcb17d2d2fcb2f4ba4856c1131c 100755 (executable)
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -13,7 +13,7 @@ test_expect_success 'split sample box' \
        'git mailsplit -o. "$DATA/sample.mbox" >last &&
        last=$(cat last) &&
        echo total is $last &&
-       test $(cat last) = 17'
+       test $(cat last) = 18'
 
 check_mailinfo () {
        mail=$1 opt=$2
@@ -158,4 +158,17 @@ test_expect_success 'mailinfo handles rfc2822 comment' '
        test_cmp "$DATA/comment.expect" comment/info
 '
 
+test_expect_success 'mailinfo with mailinfo.scissors config' '
+       test_config mailinfo.scissors true &&
+       (
+               mkdir sub &&
+               cd sub &&
+               git mailinfo ../msg0014.sc ../patch0014.sc <../0014 >../info0014.sc
+       ) &&
+       test_cmp "$DATA/msg0014--scissors" msg0014.sc &&
+       test_cmp "$DATA/patch0014--scissors" patch0014.sc &&
+       test_cmp "$DATA/info0014--scissors" info0014.sc
+'
+
+
 test_done