X-Git-Url: https://git.uis.cam.ac.uk/x/uis/git/git.git/blobdiff_plain/e34f80278e920e53b69016c7cecb24e4621e4564..54bc41416c5d3ecb978acb0df80d57aa3e54494c:/t/t7600-merge.sh diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index ede496c76b..302e238263 100755 --- 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 && - c3=$(git rev-parse HEAD) + c3=$(git rev-parse HEAD) && git reset --hard "$c0" && create_merge_msgs '