mercurial/cmdutil.py
changeset 38965 cf68e2649e0a
parent 38960 d99468d2b09a
child 38966 5b04b6204931
--- a/mercurial/cmdutil.py	Thu Aug 09 12:20:28 2018 +0300
+++ b/mercurial/cmdutil.py	Thu Aug 09 12:32:11 2018 +0300
@@ -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'