--- a/tests/test-stabilize-result.t	Tue May 20 13:45:52 2014 -0700
+++ b/tests/test-stabilize-result.t	Sat May 31 00:23:25 2014 -0700
@@ -160,7 +160,7 @@
   atop:[8] newer a
   rebasing to destination parent: 66719795a494
   computing new diff
-  commited as (a7cabd7bd9c2|671b9d7eeaec) (re)
+  committed as (a7cabd7bd9c2|671b9d7eeaec) (re)
   $ glog
   @  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
   |
@@ -321,7 +321,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
-  abort: Merge conflict between several amendments, and this is not yet automated
+  abort: merge conflict between several amendments (this is not automated yet)
   (/!\ You can try:
   /!\ * manual merge + resolve => new cset X
   /!\ * hg up to the parent of the amended changeset (which are named W and Z)