Show More
@@ -499,7 +499,8 b' class rebaseruntime(object):' | |||||
499 | if not self.collapsef: |
|
499 | if not self.collapsef: | |
500 | merging = p2 != nullrev |
|
500 | merging = p2 != nullrev | |
501 | editform = cmdutil.mergeeditform(merging, 'rebase') |
|
501 | editform = cmdutil.mergeeditform(merging, 'rebase') | |
502 |
editor = cmdutil.getcommiteditor(editform=editform, |
|
502 | editor = cmdutil.getcommiteditor(editform=editform, | |
|
503 | **pycompat.strkwargs(opts)) | |||
503 | if self.wctx.isinmemory(): |
|
504 | if self.wctx.isinmemory(): | |
504 | newnode = concludememorynode(repo, rev, p1, p2, |
|
505 | newnode = concludememorynode(repo, rev, p1, p2, | |
505 | wctx=self.wctx, |
|
506 | wctx=self.wctx, |
General Comments 0
You need to be logged in to leave comments.
Login now