# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1382801065 -32400
# Node ID 2a9bb64faa0b26be8dee1604f770f8921c5013fe
# Parent  065e6f1c92593af8ca85708cee083f2999c5eb1a
rebase: add description about exit code when there are unresolved conflicts

diff -r 065e6f1c9259 -r 2a9bb64faa0b hgext/rebase.py
--- 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