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
This commit is contained in:
commit
6ae5d9863b
@ -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
|
||||
'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user