]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 014a9ea ae15fd4)
Merge branch 'en/merge-multi-strategies'
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:19 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:19 +0000 (13:40 -0700)
The code that implements multi-strategy support in "git merge" has
been clean-up a bit.

* en/merge-multi-strategies:
  merge: small code readability improvement
  merge: cleanup confusing logic for handling successful merges

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

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