Patchwork [1,of,2] cmdutil: fix weird indent in _mergemsg()

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 12, 2018, 3:26 a.m.
Message ID <365ea9b1e7f8ed5e803e.1534044419@mimosa>
Download mbox | patch
Permalink /patch/33684/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 12, 2018, 3:26 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1533860317 -32400
#      Fri Aug 10 09:18:37 2018 +0900
# Node ID 365ea9b1e7f8ed5e803ea5403345afb6e219712b
# Parent  2488dcfa71f8671b7ba0d13f5ffad2ffda17a40c
cmdutil: fix weird indent in _mergemsg()

Patch

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'