D1249: rebase: rerun a rebase on-disk if IMM merge conflicts arise

[phillco (Phil Cohen)]

phillco added a comment.


  I've moved the comment back to `rebase()` to fix the help issue. I'm mostly neutral on using recursion or using this approach, though I think having to pass a flag to prevent infinite recursion would be messy.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1249

To: phillco, #hg-reviewers, durin42, dlax
Cc: dlax, mercurial-devel