| commit | 62a7648a5e0968c25bd7a0b9ff9103f920c19a8d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:44 +0000 (12 13:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:45 +0000 (12 13:51 -0700) | ||
| tree | 2ab652f222af5ef08624d43dc034705ce160e63d | treesnapshot (tar.gz zip) |
| parent | 1af632444bb837cfccfec5b3d2e5fc935fde0fa7 | commitdiff |
| parent | 57f183b698ca4f967266577687f09b09a79f0b8c | commitdiff |
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"
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"
| apply.c | diff1 | diff2 | blobhistory |