Mercurial > hg

diff hgext/rebase.py @ 19971:2a9bb64faa0b stable

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
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 27 Oct 2013 00:24:25 +0900
parents ad9db007656f
children 7d5e7799a29f
line wrap: on
line diff
--- 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