Junio C Hamano 6d99f31dda 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

2021-05-07 12:47:38 +09:00

131 KiB

Raw Blame History

View Raw