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

diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index d78deb1e710056e236ba61f4b8ceb55e11c44cbf..087929a4bfdf053124f81af3bfb73ab1e9e1709a 100755 (executable)
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -43,7 +43,7 @@ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 test_output () {
     sed -e "s/ $_x40   / X     /" <current >check
-    diff -u expected check
+    git diff expected check
 }
 
 test_expect_success \