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

[phillco (Phil Cohen)]

phillco added inline comments.

INLINE COMMENTS

> durin42 wrote in rebase.py:667
> It's just a style thing. I find avoiding recursion to generally be clearer.
> 
> @phillco dlax is right, the docstring needs fixed here (I'm surprised tests passed...)

huh, weird. not sure how they did.

REPOSITORY
  rHG Mercurial

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

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