diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-01 06:30:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-01 06:30:42 (GMT) |
| commit | af6b37fab1a97943c804f4983452c7fde5b0fbbe (patch) | |
| tree | 8ca886b1a5d0d7032bb5393c14ac82fae2dfcfc3 /t/test-lib.sh | |
| parent | 2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa (diff) | |
| parent | f8246281af9adb0fdddbcc90d2e19cb5cd5217e5 (diff) | |
| download | git-af6b37fab1a97943c804f4983452c7fde5b0fbbe.zip git-af6b37fab1a97943c804f4983452c7fde5b0fbbe.tar.gz git-af6b37fab1a97943c804f4983452c7fde5b0fbbe.tar.bz2 | |
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag:
merge: use editor by default in interactive sessions
Conflicts:
Documentation/merge-options.txt
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 709a300..b22bee7 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -64,7 +64,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 |