projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 923cd87) | patch
apply: adjust messages to account for --3way changes
authorJerry Zhang <jerry@skydio.com>
Thu, 29 Apr 2021 02:35:03 +0000 (19:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Apr 2021 03:27:45 +0000 (12:27 +0900)
commit526705fd3d14a38646a12235ee385dcc0ffc7321
treee773cfa7c37f74dfc7b3ed5ab6b110d94369e707tree | snapshot
parent923cd87ac8550a8e277bfeb19198a11b6a8ed854commit | diff
apply: adjust messages to account for --3way changes

"git apply" specifically calls out when it is falling back to 3way
merge application.  Since the order changed to preferring 3way and
falling back to direct application, continue that behavior by
printing whenever 3way fails and git has to fall back.

Signed-off-by: Jerry Zhang <jerry@skydio.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
apply.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.