Mercurial > evolve
diff tests/test-tutorial.t @ 803:b96d51a357bd
test: get rid of all reference to conflicting changesets
They are now called divergent for a long time.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 20 Feb 2014 13:32:04 -0800 |
| parents | 03844e1fbfe6 |
| children | c2bf0eb727f1 6a67606e1c34 |
line wrap: on
line diff
--- a/tests/test-tutorial.t Wed Feb 19 18:03:13 2014 -0800 +++ b/tests/test-tutorial.t Thu Feb 20 13:32:04 2014 -0800 @@ -826,7 +826,7 @@ Handling Divergent amend ---------------------------------------------- -We can detect that multiple diverging/conflicting amendments have been made. +We can detect that multiple diverging amendments have been made. The `evolve` command can solve this situation. But all corner case are not handled now.