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

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index ee386cfbf3be4d457644103b223e1fcafaa363ba..78c2e0864f56ecf39e8738e8fecec9ca8dd4e8a2 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -368,12 +368,12 @@ cat > expect << EOF
 weird
 EOF
 
-test_expect_success "rename succeeded" "diff -u expect .git/config"
+test_expect_success "rename succeeded" "git diff expect .git/config"
 
 test_expect_failure "rename non-existing section" \
        'git-config --rename-section branch."world domination" branch.drei'
 
-test_expect_success "rename succeeded" "diff -u expect .git/config"
+test_expect_success "rename succeeded" "git diff expect .git/config"
 
 test_expect_success "rename another section" \
        'git-config --rename-section branch."1 234 blabl/a" branch.drei'
@@ -389,7 +389,7 @@ cat > expect << EOF
 weird
 EOF
 
-test_expect_success "rename succeeded" "diff -u expect .git/config"
+test_expect_success "rename succeeded" "git diff expect .git/config"
 
 cat >> .git/config << EOF
   [branch "zwei"] a = 1 [branch "vier"]
@@ -405,7 +405,7 @@ weird
 EOF
 
 test_expect_success "section was removed properly" \
-       "diff -u expect .git/config"
+       "git diff -u expect .git/config"
 
 test_expect_success numbers '