Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 37125 6f570c501e3e
parent 37043 a8d8cdafe29c
child 37332 b48b7b130d08 
--- a/hgext/rebase.py	Sun Mar 25 11:58:05 2018 +0900
+++ b/hgext/rebase.py	Mon Mar 05 00:30:00 2018 -0500
@@ -525,7 +525,7 @@
                 with ui.configoverride(overrides, 'rebase'):
                     stats = rebasenode(repo, rev, p1, base, self.collapsef,
                                        dest, wctx=self.wctx)
-                    if stats[3] > 0:
+                    if stats.unresolvedcount > 0:
                         if self.inmemory:
                             raise error.InMemoryMergeConflictsError()
                         else:
Mercurial