X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft7405-submodule-merge.sh;h=9a21f783d3a5fedaa56df26919ab8e0456872e90;hb=91c8b825ce2a301e9861be60c3d7853fefa93c04;hp=aa6c44ce4f5855bd4f18f737c7b1239407549eab;hpb=f3924858133dff1e94c992b689fa425a6d27d4fd;p=git.git

diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index aa6c44ce4..9a21f783d 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -54,13 +54,13 @@ test_expect_success setup '
 	git merge -s ours a
 '
 
-test_expect_failure 'merging with modify/modify conflict' '
+test_expect_success 'merging with modify/modify conflict' '
 
 	git checkout -b test1 a &&
 	test_must_fail git merge b &&
 	test -f .git/MERGE_MSG &&
-	git diff
-
+	git diff &&
+	test -n "$(git ls-files -u)"
 '
 
 test_expect_success 'merging with a modify/modify conflict between merge bases' '