changeset 492 | 7ecd41520dae |
parent 364 | 616305c63510 |
child 494 | 80bd1e8f5ae9 |
--- a/docs/index.rst Fri Aug 24 10:44:23 2012 +0200 +++ b/docs/index.rst Fri Aug 24 11:17:18 2012 +0200 @@ -137,11 +137,7 @@ Here is a list of know issue that will be fixed later: -* ``hg stabilize`` does not handle merge conflict. - - You must fallback to graft or rebase when that happen. - -* rewriting conflict are not detected yet``hg stabilize`` does not +* rewriting conflict are not detected yet``hg evolve`` does not handle them. * ``hg update`` can move an obsolete parent