# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1392931924 28800
# Node ID b96d51a357bd696da1b801c62b496dc8e9d94ffe
# Parent  80e0789591299fd791347c57df51668cb3544cea
test: get rid of all reference to conflicting changesets

They are now called divergent for a long time.

diff -r 80e078959129 -r b96d51a357bd tests/test-obsolete.t
--- a/tests/test-obsolete.t	Wed Feb 19 18:03:13 2014 -0800
+++ b/tests/test-obsolete.t	Thu Feb 20 13:32:04 2014 -0800
@@ -637,7 +637,7 @@
 #no produced by 2.3
 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
 
-Check conflict detection
+Check divergence detection
 
   $ hg up 9468a5f5d8b2 #  add obsol_d''
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -650,7 +650,7 @@
   update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
   bumped: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
-  $ hg log -r 'conflicting()'
+  $ hg log -r 'divergent()'
   changeset:   12:6db5e282cb91
   parent:      10:2033b4e49474
   user:        test
diff -r 80e078959129 -r b96d51a357bd tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Wed Feb 19 18:03:13 2014 -0800
+++ b/tests/test-stabilize-result.t	Thu Feb 20 13:32:04 2014 -0800
@@ -171,7 +171,7 @@
   o  0:07f494440405@default(public) bk:[] adda
   
 
-Stabilize conflicting changesets with same parent
+Stabilize divergenent changesets with same parent
 =================================================
 
   $ rm a.orig
@@ -291,7 +291,7 @@
   +conflict
   +babar
 
-Check conflicting during conflicting resolution
+Check conflict during divergence resolution
 -------------------------------------------------
 
   $ hg up --hidden 15
diff -r 80e078959129 -r b96d51a357bd tests/test-tutorial.t
--- 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.