diff options
| author |  Edmundo Carmona Antoranz <eantoranz@gmail.com> | 2019-07-08 21:15:59 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-09 11:29:16 -0700 |
| commit | f00abe6ae05ac67aa3a22469a1d8f84defd1df6c (patch) | |
| tree | 26586a3437f0c17f2a96fbf8fb0c05a40dd43239 /builtin/verify-tag.c | |
| parent | The third batch (diff) | |
| download | tgif-f00abe6ae05ac67aa3a22469a1d8f84defd1df6c.tar.xz | |
builtin/merge.c - cleanup of code in for-cycle that tests strategies
The cmd_merge() function has a loop that tries different
merge strategies in turn, and stops when a strategy gets a
clean merge, while keeping the "best" conflicted merge so
far.
Make the loop easier to follow by moving the code around,
ensuring that there is only one "break" in the loop where
an automerge succeeds. Also group the actions that are
performed after an automerge succeeds together to a single
location, outside and after the loop.
Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/verify-tag.c')
0 files changed, 0 insertions, 0 deletions