>* jc/trivial-threeway-binary-merge (2021-07-28) 1 commit > - ll-merge: teach ll_binary_merge() a trivial three-way merge > > The built-in merge driver for binary files learned to resolve > trivial three-way merges (e.g. apply change, which turns A into B, > to content A) by itself, which would help "git apply --3way" used > when there is no need to use "--3way". > > Will discard. > Replace with a trivial-merge logic in apply.c::try_treeway() or > apply.c::three_way_merge(). > This patch seems to have missed several merge cycles, hope it can go to next stage as soon as possible.
