fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable

diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index 0f3c42ab35891d1dd671649ff38074a1d83e2a5b..b9a22190e86a0b8718b215771352ecefbdf86edc 100755 (executable)
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -30,7 +30,7 @@ commit_file () {
 }
 
 test_create_repo sm1 &&
-add_file . foo
+add_file . foo >/dev/null
 
 head1=$(add_file sm1 foo1 foo2)