Patchwork [1,of,2,STABLE] backout: document return code of merge conflict

login
register
mail settings
Submitter Yuya Nishihara
Date March 8, 2014, 11:40 a.m.
Message ID <734580066b4ec44a59cf.1394278811@gimlet>
Download mbox | patch
Permalink /patch/3889/
State Accepted
Commit e01cff65f4c55822ea79783ce36c104b2c64d5bf
Headers show

Comments

Yuya Nishihara - March 8, 2014, 11:40 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1394271716 -32400
#      Sat Mar 08 18:41:56 2014 +0900
# Branch stable
# Node ID 734580066b4ec44a59cfe307ebc7999f9425c23b
# Parent  2d183dd5438450e465785b2204e406ed48e6d5f8
backout: document return code of merge conflict

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -416,7 +416,7 @@  def backout(ui, repo, node=None, rev=Non
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
-    Returns 0 on success.
+    Returns 0 on success, 1 if there are unresolved files.
     '''
     if rev and node:
         raise util.Abort(_("please specify just one revision"))