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

[dlax (Denis Laxalde)]

dlax added inline comments.

INLINE COMMENTS

> durin42 wrote in rebase.py:667
> Avoiding the recursion seems like a nice thing to me. I  prefer what Phil has to just doing recursion...

Why would that be nice? Do you foresee any problem?
It just makes the code harder to follow, IMHO.

Besides, now the `rebase()` no longer has a docstring, meaning that help is broken.

REPOSITORY
  rHG Mercurial

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

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