Merge branch 'do/rebase-i-arbitrary'

diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index aa6c44ce4f5855bd4f18f737c7b1239407549eab..9a21f783d3a5fedaa56df26919ab8e0456872e90 100755 (executable)
--- 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' '