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

diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 6ec5f7c48bdde7ff41e14c1e355b79387140ecf0..c0dc94909b694439e389ceeeecec82ed36864ec0 100755 (executable)
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -24,28 +24,28 @@ test_expect_success setup '
 test_expect_success 'ls-remote --tags .git' '
 
        git ls-remote --tags .git >actual &&
-       diff -u expected.tag actual
+       test_cmp expected.tag actual
 
 '
 
 test_expect_success 'ls-remote .git' '
 
        git ls-remote .git >actual &&
-       diff -u expected.all actual
+       test_cmp expected.all actual
 
 '
 
 test_expect_success 'ls-remote --tags self' '
 
        git ls-remote --tags self >actual &&
-       diff -u expected.tag actual
+       test_cmp expected.tag actual
 
 '
 
 test_expect_success 'ls-remote self' '
 
        git ls-remote self >actual &&
-       diff -u expected.all actual
+       test_cmp expected.all actual
 
 '