Mercurial > hg-stable
diff tests/test-sparse.t @ 35704:41ef02ba329b
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
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 08 Jan 2018 19:41:47 +0530 |
| parents | 4441705b7111 |
| children | 7a1806e0daea |
line wrap: on
line diff
--- a/tests/test-sparse.t Thu Jan 04 21:37:03 2018 -0800 +++ b/tests/test-sparse.t Mon Jan 08 19:41:47 2018 +0530 @@ -224,7 +224,7 @@ merging hide warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ hg debugsparse [exclude]