Mercurial > evolve

diff tests/test-stabilize-result.t @ 803:b96d51a357bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bfdfdf731f8a
children 17ac69db9329 561b3cdb4453
line wrap: on
line diff
--- 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