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

diff --git a/t/t2201-add-update-typechange.sh b/t/t2201-add-update-typechange.sh
index 75c440c74b46b247908eb1815d34dac0bfdd1780..e15e3eb81b11216f87a8010aa11edc0835e29b0f 100755 (executable)
--- a/t/t2201-add-update-typechange.sh
+++ b/t/t2201-add-update-typechange.sh
@@ -104,17 +104,17 @@ test_expect_success modify '
        } >expect-final
 '
 
-test_expect_failure diff-files '
+test_expect_success diff-files '
        git diff-files --raw >actual &&
        diff -u expect-files actual
 '
 
-test_expect_failure diff-index '
+test_expect_success diff-index '
        git diff-index --raw HEAD -- >actual &&
        diff -u expect-index actual
 '
 
-test_expect_failure 'add -u' '
+test_expect_success 'add -u' '
        rm -f ".git/saved-index" &&
        cp -p ".git/index" ".git/saved-index" &&
        git add -u &&
@@ -122,7 +122,7 @@ test_expect_failure 'add -u' '
        diff -u expect-final actual
 '
 
-test_expect_failure 'commit -a' '
+test_expect_success 'commit -a' '
        if test -f ".git/saved-index"
        then
                rm -f ".git/index" &&