Try normalizing files to avoid delete/modify conflicts when merging

diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index 127baf8560b8a6c208a6afc076f6d704aaecdd1e..d1ab86ebd7c66285d922bf4c6613956afa41c9c1 100755 (executable)
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6038-merge-text-auto.sh
@@ -51,7 +51,7 @@ test_expect_success 'Check merging addition of text=auto' '
        test_cmp file file.temp
 '
 
-test_expect_failure 'Test delete/normalize conflict' '
+test_expect_success 'Test delete/normalize conflict' '
        git checkout side &&
        git reset --hard initial &&
        git rm file &&