merge-recursive: handle D/F conflict case more carefully.

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 17c1b80b5bef863a62b533153ed91e17e47f1a72..ca96918da2008e9036624fac67c6337961e3c2b0 100755 (executable)
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -11,7 +11,7 @@ test_expect_success 'split sample box' \
        'git-mailsplit -o. ../t5100/sample.mbox >last &&
        last=`cat last` &&
        echo total is $last &&
-       test `cat last` = 5'
+       test `cat last` = 8'
 
 for mail in `echo 00*`
 do