--- a/tests/test-stabilize-result.t	Tue Mar 04 11:02:42 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