diff options
| author |  Jerry Zhang <jerry@skydio.com> | 2021-04-28 19:35:03 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-04-29 12:27:45 +0900 |
| commit | 526705fd3d14a38646a12235ee385dcc0ffc7321 (patch) | |
| tree | e773cfa7c37f74dfc7b3ed5ab6b110d94369e707 /daemon.c | |
| parent | git-apply: try threeway first when "--3way" is used (diff) | |
| download | tgif-526705fd3d14a38646a12235ee385dcc0ffc7321.tar.xz | |
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>
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions