hgext/histedit.py
branchstable
changeset 19972 1e13a5a9c66e
parent 19852 57479e0d203d
child 20071 4778f398ec83
--- a/hgext/histedit.py	Sun Oct 27 00:24:25 2013 +0900
+++ b/hgext/histedit.py	Sun Oct 27 00:24:25 2013 +0900
@@ -471,6 +471,10 @@
     instead of --outgoing to specify edit target revision exactly in
     such ambiguous situation. See :hg:`help revsets` for detail about
     selecting revisions.
+
+    Returns 0 on success, 1 if user intervention is required (not only
+    for intentional "edit" command, but also for resolving unexpected
+    conflicts).
     """
     # TODO only abort if we try and histedit mq patches, not just
     # blanket if mq patches are applied somewhere