t7610: delete some now-unnecessary 'git reset --hard' lines

Tests now always run 'git reset --hard' at the end (even if they
fail), so it's no longer necessary to run 'git reset --hard' at the
beginning of a test.

Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index df6b4c579c3a7b8bc9d6b28993074125b09eb9ca..28b5f847a55142bd0b3a12fc67c7c37440d64a78 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -184,7 +184,6 @@ test_expect_success 'mergetool in subdir' '
 
 test_expect_success 'mergetool on file in parent dir' '
        test_when_finished "git reset --hard" &&
-       git reset --hard &&
        git submodule update -N &&
        (
                cd subdir &&
@@ -277,7 +276,6 @@ test_expect_success 'conflicted stash sets up rerere'  '
 
 test_expect_success 'mergetool takes partial path' '
        test_when_finished "git reset --hard" &&
-       git reset --hard &&
        test_config rerere.enabled false &&
        git checkout -b test$test_count branch1 &&
        git submodule update -N &&