Skip to content
Snippets Groups Projects
Commit 41ef02ba329b authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

merge: add `--abort` flag which can abort the merge

Currently we don't have a good functionality to abort the merge and tell user to
do `hg update -C .` which can leads to different results if user missed the '.'
and moreover does not align with other abort functionalities like rebase, shelve
etc.

This patch adds `hg merge --abort` which will abort the ongoing merge and take
us back to the chagneset where we started from. Works in both cases when merge
resulted in conflicts and when there were no conflicts.

.. feature::

    A `--abort` flag to merge command to abort the ongoing merge.

Differential Revision: https://phab.mercurial-scm.org/D1829
parent 9a50ffd15b25
No related merge requests found
Showing
with 180 additions and 76 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment