Merge branch 'maint-1.6.0' into maint-1.6.1

[git.git] / t / t3409-rebase-preserve-merges.sh

diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 5ddd1d1a93c74fe81da142f07a659c75e3fd9e7c..e6c832780fbe00afe5c513f0f5e4c87d7020e2a4 100755 (executable)
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -75,7 +75,7 @@ test_expect_success 'rebase -p fakes interactive rebase' '
        )
 '
 
-test_expect_failure '--continue works after a conflict' '
+test_expect_success '--continue works after a conflict' '
        (
        cd clone2 &&
        git fetch &&
@@ -83,6 +83,7 @@ test_expect_failure '--continue works after a conflict' '
        test 2 = $(git ls-files B | wc -l) &&
        echo Resolved again > B &&
        test_must_fail git rebase --continue &&
+       grep "^@@@ " .git/rebase-merge/patch &&
        git add B &&
        git rebase --continue &&
        test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&