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

diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 37c9a9f254d626939ef28398ec15bec606a9c588..841773f75fc085d07836b39b3775f49bde5d8d19 100755 (executable)
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -34,7 +34,6 @@ test_expect_success setup '
 test_expect_success apply '
 
        git checkout test &&
-       git reset --hard && #### checkout seems to be buggy
        git diff --exit-code test &&
        git diff --exit-code --cached test &&
        git apply --index test.patch
@@ -54,4 +53,3 @@ test_expect_success 'check result' '
 '
 
 test_done
-