Mercurial Mercurial > mercurial / 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 36960 66651ec259ea
parent 36933 61600b024a70
child 36975 795eb53f1d3e 
--- a/hgext/rebase.py	Wed Mar 07 19:57:50 2018 -0800
+++ b/hgext/rebase.py	Mon Mar 05 00:18:07 2018 -0500
@@ -488,7 +488,7 @@
                 with ui.configoverride(overrides, 'rebase'):
                     stats = rebasenode(repo, rev, p1, base, self.collapsef,
                                        dest, wctx=self.wctx)
-                    if stats and stats[3] > 0:
+                    if stats[3] > 0:
                         if self.wctx.isinmemory():
                             raise error.InMemoryMergeConflictsError()
                         else:
mercurial