merge: use editor by default in interactive sessions

[git.git] / t / test-lib.sh

diff --git a/t/test-lib.sh b/t/test-lib.sh
index bdd9513b84301275330d3dd7e49af05081ef9cd7..ed32c2ab7be2f3ae4045b21649ed8f558c240c30 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -63,7 +63,8 @@ GIT_AUTHOR_NAME='A U Thor'
 GIT_COMMITTER_EMAIL=committer@example.com
 GIT_COMMITTER_NAME='C O Mitter'
 GIT_MERGE_VERBOSITY=5
-export GIT_MERGE_VERBOSITY
+GIT_MERGE_AUTOEDIT=no
+export GIT_MERGE_VERBOSITY GIT_MERGE_AUTOEDIT
 export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
 export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 export EDITOR