diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-01 13:40:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 13:40:19 -0700 |
| commit | 624a93623469b5165643a5e6c913666df46ab6c7 (patch) | |
| tree | dbe19f22d2d3e6c09c42724748ce49fbace37610 /builtin/commit.c | |
| parent | Merge branch 'en/t4301-more-merge-tree-tests' (diff) | |
| parent | merge: small code readability improvement (diff) | |
| download | git-624a93623469b5165643a5e6c913666df46ab6c7.tar.gz git-624a93623469b5165643a5e6c913666df46ab6c7.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions