summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:45:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-19 13:45:01 -0700
commit6ae5d9863ba13b5d138851d8e622c9ed05313966 (patch)
treedbd24f2f5d334f6348a83b99f1039b2c8a44c5d8 /t
parentMerge branch 'mv/sequencer-pick-error-diag' (diff)
parentt6200: avoid path mangling issue on Windows (diff)
downloadtgif-6ae5d9863ba13b5d138851d8e622c9ed05313966.tar.xz
Merge branch 'rt/commentchar-fmt-merge-msg'
A test fix for recent update. * rt/commentchar-fmt-merge-msg: t6200: avoid path mangling issue on Windows
Diffstat (limited to 't')
-rwxr-xr-xt/t6200-fmt-merge-msg.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index e7e945db09..54b5744cc5 100755
--- 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
'