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

diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 3d81e1f19aa9d0b7e7d4ffbf4338d9048e8196c1..9fd9d0700033027921c90290cedc0a31d71c7733 100644 (file)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -100,7 +100,7 @@ test_expect_success 'prune: prune unreachable heads' '
 
 '
 
-test_expect_failure 'prune: do not prune heads listed as an argument' '
+test_expect_success 'prune: do not prune heads listed as an argument' '
 
        : > file2 &&
        git add file2 &&