# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1394271716 -32400
# Node ID e01cff65f4c55822ea79783ce36c104b2c64d5bf
# Parent  9658a79968c674503e4241d175c1bdbc9b2545b0
backout: document return code of merge conflict

diff -r 9658a79968c6 -r e01cff65f4c5 mercurial/commands.py
--- a/mercurial/commands.py	Tue Apr 01 02:46:03 2014 +0900
+++ b/mercurial/commands.py	Sat Mar 08 18:41:56 2014 +0900
@@ -416,7 +416,7 @@
 
     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"))