diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-04 00:45:47 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 22:04:34 -0800 |
| commit | 8d0fc48f27304ac1bc7abf802ec53fe66fedb15a (patch) | |
| tree | a94f060d700be797393ae11ea5a975110c2f77b2 /t/test-lib.sh | |
| parent | 183d79724f6c442f74309dd04c89d3cb48ded628 (diff) | |
| download | git-8d0fc48f27304ac1bc7abf802ec53fe66fedb15a.tar.gz git-8d0fc48f27304ac1bc7abf802ec53fe66fedb15a.tar.xz | |
Default GIT_MERGE_VERBOSITY to 5 during tests.
Its really nice to be able to run a test with -v and automatically
see the "debugging" dump from merge-recursive, especially if we
are actually trying to debug merge-recursive.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/test-lib.sh')
| -rwxr-xr-x | t/test-lib.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 8e3ee6cd7..37822fc13 100755 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -30,6 +30,8 @@ unset GIT_INDEX_FILE unset GIT_OBJECT_DIRECTORY unset SHA1_FILE_DIRECTORIES unset SHA1_FILE_DIRECTORY +GIT_MERGE_VERBOSITY=5 +export GIT_MERGE_VERBOSITY export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME export EDITOR VISUAL |