Andrew's git / gitweb.git / blobdiff
?
apply: diagnose incomplete submodule object name better
[gitweb.git] / t / t6037-merge-ours-theirs.sh
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
index 8d05671414463cf18fa455867254024948e479b7..3889eca4ae8524cd62eaf45b4d7a2394e53da429 100755 (executable)
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6037-merge-ours-theirs.sh
@@ -54,7 +54,7 @@ test_expect_success 'recursive favouring ours' '
 '
 
 test_expect_success 'binary file with -Xours/-Xtheirs' '
-       echo "file -merge" >.gitattributes &&
+       echo file binary >.gitattributes &&
 
        git reset --hard master &&
        git merge -s recursive -X theirs side &&