Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: document return code of merge conflict stable
authorYuya Nishihara <yuya@tcha.org>
Sat, 08 Mar 2014 18:41:56 +0900
branchstable
changeset 20871 e01cff65f4c5
parent 20869 9658a79968c6
child 20872 3f83fc5cfe71
backout: document return code of merge conflict
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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"))
mercurial