# HG changeset patch # User Yuya Nishihara # Date 2018-08-10 00:18:37 # Node ID 3f0ef8d194133746f9c89623ae3c020a351fc8e0 # Parent b935adb4b0412f77a01ace4ea550fa99a350a9dd cmdutil: fix weird indent in _mergemsg() diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -617,7 +617,7 @@ def _graftmsg(): 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'