diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-03 00:53:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-03 00:53:57 +0900 |
| commit | ff8e25e99e46b0425990d48c2f1d964a68fc3908 (patch) | |
| tree | 62d6454400d597237497adef73d307cdde7a0ebf /t | |
| parent | Eighth batch for 2.20 (diff) | |
| parent | merge-recursive: avoid showing conflicts with merge branch before HEAD (diff) | |
| download | tgif-ff8e25e99e46b0425990d48c2f1d964a68fc3908.tar.xz | |
Merge branch 'en/merge-cleanup-more'
Further clean-up of merge-recursive machinery.
* en/merge-cleanup-more:
merge-recursive: avoid showing conflicts with merge branch before HEAD
merge-recursive: improve auto-merging messages with path collisions
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 59e52c5a09..e1cef58f2a 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -230,13 +230,13 @@ test_expect_success 'git detects differently handled merges conflict' ' :2:new_a :3:new_a && test_cmp expect actual && - git cat-file -p B:new_a >ours && - git cat-file -p C:new_a >theirs && + git cat-file -p C:new_a >ours && + git cat-file -p B:new_a >theirs && >empty && test_must_fail git merge-file \ - -L "Temporary merge branch 2" \ - -L "" \ -L "Temporary merge branch 1" \ + -L "" \ + -L "Temporary merge branch 2" \ ours empty theirs && sed -e "s/^\([<=>]\)/\1\1\1/" ours >expect && git cat-file -p :1:new_a >actual && |