Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 984:b286f77d680c
tests: fix grammar, spelling, punctuation in comments
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Sat, 21 Jun 2014 18:31:21 -0400 |
| parents | c768f7666106 |
| children | c1f8ece4182d |
line wrap: on
line diff
--- 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