Merge branch 'jn/config-ignore-inaccessible' into maint

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index e7e945db098de4ca491bea5dac36df34bcb13ebd..54b5744cc526e172acb79bb204af1800fdceb315 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -179,8 +179,8 @@ test_expect_success '--log=5 with custom comment character' '
        cat >expected <<-EOF &&
        Merge branch ${apos}left${apos}
 
-       / By Another Author (3) and A U Thor (2)
-       / Via Another Committer
+       x By Another Author (3) and A U Thor (2)
+       x Via Another Committer
        * left:
          Left #5
          Left #4
@@ -189,7 +189,7 @@ test_expect_success '--log=5 with custom comment character' '
          Common #1
        EOF
 
-       git -c core.commentchar="/" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
+       git -c core.commentchar="x" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
        test_cmp expected actual
 '