diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-15 13:15:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-15 13:15:26 -0700 |
| commit | c76fcf3e46a86d389739b7ee94b3d4faa351af84 (patch) | |
| tree | 49d216f9c9d2d5715ece2dc8f01b6914c0a738f9 /userdiff.c | |
| parent | Merge branch 'bs/doc-bugreport-outdir' (diff) | |
| parent | apply: resolve trivial merge without hitting ll-merge with "--3way" (diff) | |
| download | tgif-c76fcf3e46a86d389739b7ee94b3d4faa351af84.tar.xz | |
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"
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions