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
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 0885E2C15C; Sat, 11 Aug 2018 23:27:17 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id vswyTHTOctfp; Sat, 11 Aug 2018 23:27:16 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 7A6732C1B8; Sat, 11 Aug 2018 23:27:16 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 660BB2C1B8 for <mercurial-devel@mercurial-scm.org>; Sat, 11 Aug 2018 23:27:14 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id QjwI0RvIFYCl for <mercurial-devel@mercurial-scm.org>; Sat, 11 Aug 2018 23:27:13 -0400 (EDT) Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by mercurial-scm.org (Postfix) with ESMTPS id EB6E22C15C for <mercurial-devel@mercurial-scm.org>; Sat, 11 Aug 2018 23:27:12 -0400 (EDT) Received: by mail-pg1-x52a.google.com with SMTP id w10-v6so6063770pgv.2 for <mercurial-devel@mercurial-scm.org>; Sat, 11 Aug 2018 20:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:mime-version:content-transfer-encoding:subject:message-id :user-agent:date:from:to; bh=v3iJrOCbsbIrF0LHms5MqPOVdGEUnsu1jc9AvMUr8qs=; b=gFaG3vh4YzT1UX53soQ13l0LSz/1GnorI6cCIuzWSowJPSGP5mqA0xCfQv/rja7yMN 0rsMdFgi+iax2EdJIoYJP/gbUSLWaEZjdUIQxvajNe6HT/wERHz77/VciMTXanRZX+Wg OvF5aRP8BFwvZjQ6UCKM+TUU7GNwt2igaLx7JJ9Qo/ZCBDD/EU4F2koPivCPKvTc8XQu 8WCUzfGTLUh8vs7w14j/z4ALxoC14ovzTbP9Nilk9JCzoggZff5ShNLiXcodDB7nBnF4 jsgf9iT8Z1BBHtCXaP6/qv5frp0/pwEhS0hWyqS+aAdEOpgEJxQur1QM9eaYGj4atlN0 souQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:mime-version:content-transfer-encoding :subject:message-id:user-agent:date:from:to; bh=v3iJrOCbsbIrF0LHms5MqPOVdGEUnsu1jc9AvMUr8qs=; b=ZrIWzIM4djOkPGppfevDs47T409JfzrGppeoO2nModoMOVR+/KInCaWl3nH0C8MUMh twJ+PPlm0fcL7Wi4/0Ozu8rlbP0sTef4Lf7YcKpbqNN27y7ncrez6x634lT6Iv+eb8PR MW289zLcOhkz+hnCYXsAa3qa4sLZoQii84BFFRDvG0Y4f03V2Nh3wcYGBnON2yBDNLRp lnmF8O16AJda7toCvtoyHziDee3io4rgBiXFmFAG3Kui4mgHbaxI3oKy6+nuCAHsRFla 5cDMyh/dOwVm002smvKHqxIwpU7AXruf1aOw5D45Ak49mNzF5BQjB5LqMIx7LGHhbHAb WOww== X-Gm-Message-State: AOUpUlGSPiNwx4lc87VYuv5EWRsbeJOkwJu0tM1MTYsfkCYxbZt8huxq DWIMXGvRlpw/3MT3S6z8KOGb+TxC X-Google-Smtp-Source: AA+uWPz/yJGB17yBMN09xD2mAtwTvXRZiocrEizvdvPHUOPuYuyp5tKVNK9dVdB7w0MR/yKDi9Dnrg== X-Received: by 2002:a63:fb57:: with SMTP id w23-v6mr12062184pgj.441.1534044431581; Sat, 11 Aug 2018 20:27:11 -0700 (PDT) Received: from [127.0.1.1] (flets-202-70-212-9.client.pikara.ne.jp. [202.70.212.9]) by smtp.gmail.com with ESMTPSA id b18-v6sm17002561pgk.15.2018.08.11.20.27.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Aug 2018 20:27:10 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 1 of 2] cmdutil: fix weird indent in _mergemsg() X-Mercurial-Node: 365ea9b1e7f8ed5e803ea5403345afb6e219712b X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <365ea9b1e7f8ed5e803e.1534044419@mimosa> X-Mercurial-Series-Id: <365ea9b1e7f8ed5e803e.1534044419@mimosa> User-Agent: Mercurial-patchbomb/4.7+196-d99468d2b09a Date: Sun, 12 Aug 2018 12:26:59 +0900 From: Yuya Nishihara <yuya@tcha.org> To: mercurial-devel@mercurial-scm.org X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Yuya Nishihara - Aug. 12, 2018, 3:26 a.m.
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'