]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit624a93623469b5165643a5e6c913666df46ab6c7
treedbe19f22d2d3e6c09c42724748ce49fbace37610tree | snapshot
parent014a9ea20774a1e83170ee23fdd606e85dced452commit | diff
parentae15fd4116212d8f2168e321594ee3acc2f50a5fcommit | diff
Merge branch 'en/merge-multi-strategies'

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
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.