diff --git a/hgext/rebase.py b/hgext/rebase.py index 36edfbac7281c731b1aed8e73555b22c2ccb96c0_aGdleHQvcmViYXNlLnB5..e6b643ccf87d73638c754fe9ced8c6add00413e3_aGdleHQvcmViYXNlLnB5 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -825,5 +825,6 @@ **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')) @@ -828,5 +829,6 @@ else: ui.status(_('there will be no conflict, you can rebase\n')) + return 0 finally: _origrebase(ui, repo, abort=True) elif inmemory: diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t index 36edfbac7281c731b1aed8e73555b22c2ccb96c0_dGVzdHMvdGVzdC1yZWJhc2UtaW5tZW1vcnkudA==..e6b643ccf87d73638c754fe9ced8c6add00413e3_dGVzdHMvdGVzdC1yZWJhc2UtaW5tZW1vcnkudA== 100644 --- a/tests/test-rebase-inmemory.t +++ b/tests/test-rebase-inmemory.t @@ -287,6 +287,7 @@ rollback completed hit a merge conflict rebase aborted + [1] $ hg diff $ hg status $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" @@ -322,3 +323,4 @@ merging e hit a merge conflict rebase aborted + [1]