| commit | 00c7e7e7e8a2aa07b2cd3a09c8f9e11872727d86 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Apr 2015 20:01:44 +0000 (23 13:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:17:52 +0000 (29 13:17 -0700) | ||
| tree | 27e02b5a2c9139ab6bbe552629313229213c075a | treesnapshot (tar.gz zip) |
| parent | 9e62316df7f918eabc879f97da76543cc5f0b3fc | commitdiff |
merge: simplify code flow
One of the first things cmd_merge() does is to see if the "--abort"
option is given and run "reset --merge" and exit. When the control
reaches this point, we know "--abort" was not given.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
One of the first things cmd_merge() does is to see if the "--abort"
option is given and run "reset --merge" and exit. When the control
reaches this point, we know "--abort" was not given.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |