]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc76fcf3e46a86d389739b7ee94b3d4faa351af84
tree49d216f9c9d2d5715ece2dc8f01b6914c0a738f9tree | snapshot
parentf696272e5887eee2a3b67bd403286966749305c5commit | diff
parent57f183b698ca4f967266577687f09b09a79f0b8ccommit | diff
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"
apply.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.