hgext/rebase.py

--- a/hgext/rebase.py	Fri Mar 24 00:33:35 2017 -0400
+++ b/hgext/rebase.py	Sat Jun 23 08:59:18 2018 +0530
@@ -825,8 +825,10 @@
                             **opts)
         except error.InMemoryMergeConflictsError:
             ui.status(_('hit a merge conflict\n'))
+            return 1
         else:
             ui.status(_('there will be no conflict, you can rebase\n'))
+            return 0
         finally:
             _origrebase(ui, repo, abort=True)
     elif inmemory: