Mercurial Mercurial > hg-stable / 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.
rebase: add description about exit code when there are unresolved conflicts stable
authorFUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sun, 27 Oct 2013 00:24:25 +0900
branchstable
changeset 19971 2a9bb64faa0b
parent 19970 065e6f1c9259
child 19972 1e13a5a9c66e
rebase: add description about exit code when there are unresolved conflicts
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Sat Nov 02 04:49:42 2013 +0900
+++ b/hgext/rebase.py	Sun Oct 27 00:24:25 2013 +0900
@@ -128,7 +128,8 @@
     If a rebase is interrupted to manually resolve a merge, it can be
     continued with --continue/-c or aborted with --abort/-a.
 
-    Returns 0 on success, 1 if nothing to rebase.
+    Returns 0 on success, 1 if nothing to rebase or there are
+    unresolved conflicts.
     """
     originalwd = target = None
     activebookmark = None
hg-stable