Merge branch 'jk/merge-file-exit-code'

[git/git.git] / t / t7600-merge.sh

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index ede496c..302e238 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -133,7 +133,7 @@ test_expect_success 'setup' '
        test_tick &&
        git commit -m "commit 3" &&
        git tag c3 &&
        test_tick &&
        git commit -m "commit 3" &&
        git tag c3 &&

-       c3=$(git rev-parse HEAD)
+       c3=$(git rev-parse HEAD) &&

        git reset --hard "$c0" &&
        create_merge_msgs
 '
        git reset --hard "$c0" &&
        create_merge_msgs
 '