mirror of
https://github.com/git/git.git
synced 2026-03-01 11:08:45 +00:00
62a7648a5e
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"
132 KiB
132 KiB