Mercurial > evolve
diff tests/test-uncommit.t @ 586:f01721161532 stable
evolve: rename conflicting into divergent
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 23 Oct 2012 15:44:24 +0200 |
| parents | 6989d8fe4ed2 |
| children | e291e5271694 |
line wrap: on
line diff
--- a/tests/test-uncommit.t Tue Oct 23 15:05:32 2012 +0200 +++ b/tests/test-uncommit.t Tue Oct 23 15:44:24 2012 +0200 @@ -241,7 +241,7 @@ Working directory parent is obsolete $ hg --config extensions.purge= purge $ hg uncommit -I 'set:added() and e' - 2 new conflicting changesets + 2 new divergent changesets $ hg st --copies A e $ hg st --copies --change . @@ -285,7 +285,7 @@ Working directory parent is obsolete $ hg --config extensions.purge= purge $ hg uncommit --all -X e - 1 new conflicting changesets + 1 new divergent changesets $ hg st --copies M b M d