diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-04-23 13:01:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-29 13:17:52 -0700 |
| commit | 00c7e7e7e8a2aa07b2cd3a09c8f9e11872727d86 (patch) | |
| tree | 27e02b5a2c9139ab6bbe552629313229213c075a /Documentation/git-sh-i18n.txt | |
| parent | merge: test the top-level merge driver (diff) | |
| download | tgif-00c7e7e7e8a2aa07b2cd3a09c8f9e11872727d86.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-sh-i18n.txt')
0 files changed, 0 insertions, 0 deletions