diff tests/test-stabilize-result.t @ 586:f01721161532 stable

evolve: rename conflicting into divergent

--- a/tests/test-stabilize-result.t	Tue Oct 23 15:05:32 2012 +0200
+++ b/tests/test-stabilize-result.t	Tue Oct 23 15:44:24 2012 +0200
@@ -210,7 +210,7 @@
   $ cat a.old >> a
   $ rm a.old
   $ hg amend
-  2 new conflicting changesets
+  2 new divergent changesets
   $ glog
   @  19:3883461cc228@default(draft) bk:[] More addition
   |
@@ -240,7 +240,7 @@
   merge:[19] More addition
   with: [17] More addition
   base: [15] More addition
-  merging conflicting changeset
+  merging divergent changeset
   resolving manifests
   merging a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -297,7 +297,7 @@
   Working directory parent is obsolete
   $ echo 'gotta break' >> a
   $ hg amend
-  1 new conflicting changesets
+  1 new divergent changesets
   $ hg evolve -qn
   hg update -c c956a4b140b6 &&
   hg merge ac6d600735a4 &&