mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-07 02:07:35 -05:00
c76fcf3e46
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