diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:45 -0700 |
| commit | 62a7648a5e0968c25bd7a0b9ff9103f920c19a8d (patch) | |
| tree | 2ab652f222af5ef08624d43dc034705ce160e63d /builtin/commit-graph.c | |
| parent | Merge branch 'ab/send-email-config-fix' into maint (diff) | |
| parent | apply: resolve trivial merge without hitting ll-merge with "--3way" (diff) | |
| download | git-62a7648a5e0968c25bd7a0b9ff9103f920c19a8d.tar.gz git-62a7648a5e0968c25bd7a0b9ff9103f920c19a8d.zip | |
Merge branch 'jc/trivial-threeway-binary-merge' into maint
The "git apply -3" code path learned not to bother the lower level
merge machinery when the three-way merge can be trivially resolved
without the content level merge.
* jc/trivial-threeway-binary-merge:
apply: resolve trivial merge without hitting ll-merge with "--3way"
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions