]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f696272 57f183b)
Merge branch 'jc/trivial-threeway-binary-merge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2021 20:15:26 +0000 (13:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2021 20:15:26 +0000 (13:15 -0700)
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"

1  2 
apply.c patch | diff1 | diff2 | blob | history

diff --cc apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.