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-conflict.t
changeset 984 b286f77d680c
parent 964 c768f7666106
child 986 c1f8ece4182d 
--- a/tests/test-stabilize-conflict.t	Fri Jun 13 12:49:16 2014 -0700
+++ b/tests/test-stabilize-conflict.t	Sat Jun 21 18:31:21 2014 -0400
@@ -1,6 +1,6 @@
-=================================================================
-This files test the proper behavior of evo during merge conflict.
-=================================================================
+=========================================================
+Test the proper behavior of evolve during merge conflict.
+=========================================================
 
 Initial setup
 
@@ -186,8 +186,8 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     babar count up to five
   
-proper behavior with conflict using an external merge tools
------------------------------------------------------------
+proper behavior with conflict using an external merge tool
+----------------------------------------------------------
 
   $ safesed 's/merge=.*/merge=touch/' $HGRCPATH
   $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH
evolve