Merge branch 'fg/exclude-bq'

diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 820e0105d23f97830d7c2c69a32203ed050ea3d8..e6c832780fbe00afe5c513f0f5e4c87d7020e2a4 100755 (executable)
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -83,6 +83,7 @@ test_expect_success '--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) &&