fast-import: Support reusing 'from' and brown paper bag fix reset.

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8e3ee6cd7b38e07d3fd39904066c8e64f1d3642f..37822fc13df73a8cb53428acc767947bb5844c9e 100755 (executable)
--- 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