averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-18 12:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
4e57c88e028c25ee9428b51ff829299bbb88a80c
git-mirror/builtin/merge.c
Junio C Hamano 624a936234 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
2022-09-01 13:40:19 -07:00

49 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink