##// END OF EJS Templates
rebase: add description about exit code when there are unresolved conflicts
FUJIWARA Katsunori -
r19971:2a9bb64f stable
parent child Browse files
Show More
@@ -128,7 +128,8 def rebase(ui, repo, **opts):
128 If a rebase is interrupted to manually resolve a merge, it can be
128 If a rebase is interrupted to manually resolve a merge, it can be
129 continued with --continue/-c or aborted with --abort/-a.
129 continued with --continue/-c or aborted with --abort/-a.
130
130
131 Returns 0 on success, 1 if nothing to rebase.
131 Returns 0 on success, 1 if nothing to rebase or there are
132 unresolved conflicts.
132 """
133 """
133 originalwd = target = None
134 originalwd = target = None
134 activebookmark = None
135 activebookmark = None
General Comments 0
You need to be logged in to leave comments. Login now