--- a/tests/test-stabilize-conflict.t	Sat Oct 13 16:38:23 2012 +0200
+++ b/tests/test-stabilize-conflict.t	Sat Oct 13 16:44:14 2012 +0200
@@ -61,7 +61,7 @@
   $ hg gdown
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [1] babar count up to ten
-  $ safesed 's/huit/height/' babar
+  $ safesed 's/huit/eight/' babar
   $ hg diff
   diff -r 9d5daf8bd956 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
@@ -71,7 +71,7 @@
    six
    sept
   -huit
-  +height
+  +eight
    neuf
    dix
   $ hg amend
@@ -82,13 +82,13 @@
   merging babar
   $ hg resolve -l
   $ hg log -G
-  @  changeset:   5:fd62611d0178
+  @  changeset:   5:800217d738cd
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to fifteen
   |
-  o  changeset:   4:83066dedff55
+  o  changeset:   4:6bd654225435
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -109,12 +109,12 @@
   [4] babar count up to ten
   $ safesed 's/dix/ten/' babar
   $ hg diff
-  diff -r 83066dedff55 babar
+  diff -r 6bd654225435 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
   +++ b/babar	* (glob)
   @@ -7,4 +7,4 @@
    sept
-   height
+   eight
    neuf
   -dix
   +ten
@@ -133,19 +133,19 @@
   $ hg resolve -l
   U babar
   $ hg log -G
-  @  changeset:   7:cc96f75eae0b
+  @  changeset:   7:3e191dd96e18
   |  tag:         tip
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   5:fd62611d0178
+  | @  changeset:   5:800217d738cd
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen
   | |
-  | x  changeset:   4:83066dedff55
+  | x  changeset:   4:6bd654225435
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -166,13 +166,13 @@
   grafting revision 5
   $ hg resolve -l
   $ hg log -G
-  @  changeset:   8:ce7ee8fecf30
+  @  changeset:   8:92429cce7036
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to fifteen
   |
-  o  changeset:   7:cc96f75eae0b
+  o  changeset:   7:3e191dd96e18
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -193,12 +193,12 @@
   [7] babar count up to ten
   $ safesed 's/ten/zehn/' babar
   $ hg diff
-  diff -r cc96f75eae0b babar
+  diff -r 3e191dd96e18 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
   +++ b/babar	* (glob)
   @@ -7,4 +7,4 @@
    sept
-   height
+   eight
    neuf
   -ten
   +zehn
@@ -220,19 +220,19 @@
   $ hg resolve -l
   U babar
   $ hg log -G
-  @  changeset:   10:02c637e61375
+  @  changeset:   10:a7fe09efd4a1
   |  tag:         tip
   |  parent:      0:29ec1554cfaf
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   8:ce7ee8fecf30
+  | @  changeset:   8:92429cce7036
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen
   | |
-  | x  changeset:   7:cc96f75eae0b
+  | x  changeset:   7:3e191dd96e18
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -251,6 +251,6 @@
   cinq
   six
   sept
-  height
+  eight
   neuf
   zehn