Show More
@@ -867,11 +867,6 b' def _dryrunrebase(ui, repo, opts):' | |||
|
867 | 867 | leaveunfinished=True) |
|
868 | 868 | except error.InMemoryMergeConflictsError: |
|
869 | 869 | ui.status(_('hit a merge conflict\n')) |
|
870 | if confirm: | |
|
871 | # abort as in-memory merge doesn't support conflict | |
|
872 | rbsrt._prepareabortorcontinue(isabort=True, backup=False, | |
|
873 | suppwarns=True) | |
|
874 | needsabort = False | |
|
875 | 870 | return 1 |
|
876 | 871 | else: |
|
877 | 872 | if confirm: |
General Comments 0
You need to be logged in to leave comments.
Login now