Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
index 28e9e372f34818ab5427ef0178dc2003a8018656..235f372832cb32aefff0a00c4f2ac0e19de2e55d 100755 (executable)
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@ -154,7 +154,7 @@ test_expect_success 'cherry-pick(U/U)' '
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3
 '
@@ -169,7 +169,7 @@ test_expect_success 'cherry-pick(L/L)' '
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3 8859
 '
@@ -184,7 +184,7 @@ test_expect_success 'cherry-pick(U/L)' '
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3
 '
@@ -200,7 +200,7 @@ test_expect_success 'cherry-pick(L/U)' '
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3 8859
 '