development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rt/commentchar-fmt-merge-msg'

Browse source 
A test fix for recent update.

* rt/commentchar-fmt-merge-msg:
  t6200: avoid path mangling issue on Windows
This commit is contained in:
Junio C Hamano 2013-04-19 13:45:01 -07:00
parent 4407ea49fe 16a794de88
commit 6ae5d9863b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
t/t6200-fmt-merge-msg.sh
View file

@ -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
'