D4168: status: advertise --abort instead of 'update -C .' to abort a merge
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Aug 9 14:06:51 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGcf68e2649e0a: status: advertise --abort instead of 'update -C .' to abort a merge (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4168?vs=10097&id=10129
REVISION DETAIL
https://phab.mercurial-scm.org/D4168
AFFECTED FILES
mercurial/cmdutil.py
tests/test-conflict.t
CHANGE DETAILS
diff --git a/tests/test-conflict.t b/tests/test-conflict.t
--- a/tests/test-conflict.t
+++ b/tests/test-conflict.t
@@ -58,7 +58,7 @@
# To mark files as resolved: hg resolve --mark FILE
# To continue: hg commit
- # To abort: hg update --clean . (warning: this will discard uncommitted changes)
+ # To abort: hg merge --abort
$ cat a
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -617,7 +617,7 @@
def _mergemsg():
# tweakdefaults requires `update` to have a rev hence the `.`
- return _helpmessage('hg commit', _updatecleanmsg())
+ return _helpmessage('hg commit', 'hg merge --abort')
def _bisectmsg():
msg = _('To mark the changeset good: hg bisect --good\n'
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list