projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e08cbd 526705f)
Merge branch 'jz/apply-3way-first-message-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:38 +0000 (12:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 May 2021 03:47:38 +0000 (12:47 +0900)
commit6d99f31ddafb064795d1d8f9b9bd930296f7069e
treeadf4f61cbee195077c2810dd7fd7d0b98d07c284tree | snapshot
parent6e08cbdf3857ea2b335c96f515743090ed58c709commit | diff
parent526705fd3d14a38646a12235ee385dcc0ffc7321commit | diff
Merge branch 'jz/apply-3way-first-message-fix'

When we swapped the order of --3way fallback, we forgot to adjust
the message we give when the first method fails and the second
method is attempted (which used to be "direct application failed
hence we try 3way", now it is the other way around).

* jz/apply-3way-first-message-fix:
  apply: adjust messages to account for --3way changes
apply.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.