Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-result.t
changeset 803 b96d51a357bd
parent 752 bfdfdf731f8a
child 895 17ac69db9329
child 945 561b3cdb4453 
--- 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
evolve