]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
apply.c patch | diff1 | diff2 | blob | history

diff --cc apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.