# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2014-03-08 09:41:56
# Node ID e01cff65f4c55822ea79783ce36c104b2c64d5bf
# Parent  9658a79968c674503e4241d175c1bdbc9b2545b0

backout: document return code of merge conflict

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"))