merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

diff --git a/t/t4125-apply-ws-fuzz.sh b/t/t4125-apply-ws-fuzz.sh
index d6f15be6718d581bb2a8e3ef05930977b8dffdb9..9671de799949f8f67f906cd3db907e3a53cf4eef 100755 (executable)
--- a/t/t4125-apply-ws-fuzz.sh
+++ b/t/t4125-apply-ws-fuzz.sh
@@ -37,11 +37,11 @@ test_expect_success setup '
        # patch-2 is the same as patch-1 but is based
        # on a version that already has whitespace fixed,
        # and does not introduce whitespace breakages.
-       sed -e "s/ $//" patch-1 >patch-2 &&
+       sed -e "s/ \$//" patch-1 >patch-2 &&
 
        # If all whitespace breakages are fixed the contents
        # should look like file-fixed
-       sed -e "s/ $//" file-1 >file-fixed
+       sed -e "s/ \$//" file-1 >file-fixed
 
 '
 
@@ -56,7 +56,7 @@ test_expect_success nofix '
        git apply --whitespace=nowarn patch-1 &&
 
        # The result should obviously match.
-       diff -u file-1 file
+       test_cmp file-1 file
 '
 
 test_expect_success 'withfix (forward)' '
@@ -70,7 +70,7 @@ test_expect_success 'withfix (forward)' '
        git apply --whitespace=fix patch-0 &&
        git apply --whitespace=fix patch-1 &&
 
-       diff -u file-fixed file
+       test_cmp file-fixed file
 '
 
 test_expect_success 'withfix (backward)' '
@@ -91,12 +91,12 @@ test_expect_success 'withfix (backward)' '
 
        sed -e /h/d file-fixed >fixed-head &&
        sed -e /h/d file >file-head &&
-       diff -u fixed-head file-head &&
+       test_cmp fixed-head file-head &&
 
        sed -n -e /h/p file-fixed >fixed-tail &&
        sed -n -e /h/p file >file-tail &&
 
-       ! diff -u fixed-tail file-tail
+       ! test_cmp fixed-tail file-tail
 
 '