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 /t/t9133-git-svn-nested-git-repo.sh | |
| parent | 014a9ea20774a1e83170ee23fdd606e85dced452 (diff) | |
| parent | ae15fd4116212d8f2168e321594ee3acc2f50a5f (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
Diffstat (limited to 't/t9133-git-svn-nested-git-repo.sh')
0 files changed, 0 insertions, 0 deletions