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

[durin42 (Augie Fackler)]

durin42 added inline comments.

INLINE COMMENTS

> dlax wrote in rebase.py:667
> Do we need to make another function? Can't we call rebase again with options modified?

Avoiding the recursion seems like a nice thing to me. I  prefer what Phil has to just doing recursion...

REPOSITORY
  rHG Mercurial

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

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