merge: fix incorrect merge message for ambiguous tag/branch

[thirdparty/git.git] / t / t7608-merge-messages.sh

diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 9d10583916d42092eaee29fbcafc73b1c827773b..81ced8ac3cc924a8461196cb71d27e9fc3a8f610 100755 (executable)
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -38,7 +38,7 @@ test_expect_success 'merge tag' '
        check_oneline "Merge commit Qtag-1Q"
 '
 
-test_expect_failure 'ambiguous tag' '
+test_expect_success 'ambiguous tag' '
        git checkout -b ambiguous master &&
        test_commit ambiguous &&
        git checkout master &&