Mercurial > hg

changeset 39076:3f0ef8d19413

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: fix weird indent in _mergemsg()
author Yuya Nishihara <yuya@tcha.org>
date Fri, 10 Aug 2018 09:18:37 +0900
parents b935adb4b041
children b5040a9cb84c
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Fri Aug 10 00:28:07 2018 -0400
+++ b/mercurial/cmdutil.py	Fri Aug 10 09:18:37 2018 +0900
@@ -617,7 +617,7 @@
 
 def _mergemsg():
     # tweakdefaults requires `update` to have a rev hence the `.`
-     return _helpmessage('hg commit', 'hg merge --abort')
+    return _helpmessage('hg commit', 'hg merge --abort')
 
 def _bisectmsg():
     msg = _('To mark the changeset good:    hg bisect --good\n'