| commit | c76fcf3e46a86d389739b7ee94b3d4faa351af84 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Sep 2021 20:15:26 +0000 (15 13:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Sep 2021 20:15:26 +0000 (15 13:15 -0700) | ||
| tree | 49d216f9c9d2d5715ece2dc8f01b6914c0a738f9 | treesnapshot (tar.gz zip) |
| parent | f696272e5887eee2a3b67bd403286966749305c5 | commitdiff |
| parent | 57f183b698ca4f967266577687f09b09a79f0b8c | commitdiff |
Merge branch 'jc/trivial-threeway-binary-merge'
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 |