mergetool: fix running in subdir when rerere enabled

diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh
index 95fab2036109c5a4aef8ff3d8100403fe335819f..98b7d7b969e4eb3ded40aba1f12d2afc8bad849a 100755 (executable)
--- a/t/t7105-reset-patch.sh
+++ b/t/t7105-reset-patch.sh
@@ -25,15 +25,17 @@ test_expect_success PERL 'saying "n" does nothing' '
 '
 
 test_expect_success PERL 'git reset -p' '
-       (echo n; echo y) | git reset -p &&
+       (echo n; echo y) | git reset -p >output &&
        verify_state dir/foo work head &&
-       verify_saved_state bar
+       verify_saved_state bar &&
+       test_i18ngrep "Unstage" output
 '
 
 test_expect_success PERL 'git reset -p HEAD^' '
-       (echo n; echo y) | git reset -p HEAD^ &&
+       (echo n; echo y) | git reset -p HEAD^ >output &&
        verify_state dir/foo work parent &&
-       verify_saved_state bar
+       verify_saved_state bar &&
+       test_i18ngrep "Apply" output
 '
 
 # The idea in the rest is that bar sorts first, so we always say 'y'