--- a/tests/test-stabilize-result.t	Fri Aug 24 11:49:21 2012 +0200
+++ b/tests/test-stabilize-result.t	Thu Sep 20 23:14:59 2012 +0200
@@ -31,7 +31,7 @@
   $ hg evolve -v
   move:[2] changea
   atop:[4] changea
-  hg rebase -Dr cce2c55b8965 -d 1447e1c4828d
+  hg rebase -r cce2c55b8965 -d 1447e1c4828d
   resolving manifests
   $ glog --hidden
   @  4:1447e1c4828d@default(draft) bk:[changea] changea
@@ -99,7 +99,7 @@
 Stabilize of late comer with different parent
 ==================================================
 
-(the with same parent is handled in test-evolve.t)
+(the same parent case is handled in test-evolve.t)
 
   $ glog
   @  8:e3183e9c0961@default(draft) bk:[] newer a
@@ -149,7 +149,7 @@
   $ hg evolve --any --dry-run
   recreate:[12] newer a
   atop:[8] newer a
-  hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401;
+  hg rebase --rev 15c83af6f3a3 --dest e8cc1b534401;
   hg update e3183e9c0961;
   hg revert --all --rev 15c83af6f3a3;
   hg commit --msg "latecomer update to %s" (no-eol)
@@ -171,8 +171,8 @@
   o  0:07f494440405@default(public) bk:[] adda
   
 
-Stabilize of conflicting changeset with same parent
-====================================================
+Stabilize conflicting changesets with same parent
+=================================================
 
   $ rm a.orig
   $ hg up 9
@@ -231,7 +231,7 @@
 
   $ hg evolve -qn
   hg update -c 3883461cc228 &&
-  hg merge 4754d61bc2db && 
+  hg merge 4754d61bc2db &&
   hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
   hg up -C 7391601a4bfa &&
   hg revert --all --rev tip &&
@@ -288,3 +288,38 @@
   +less
   +conflict
   +babar
+
+Check conflicting during conflicting resolution
+-------------------------------------------------
+
+  $ hg up 15
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  Working directory parent is obsolete
+  $ echo 'gotta break' >> a
+  $ hg amend
+  1 new conflicting changesets
+  $ hg evolve -qn
+  hg update -c c956a4b140b6 &&
+  hg merge ac6d600735a4 &&
+  hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&&
+  hg up -C 7391601a4bfa &&
+  hg revert --all --rev tip &&
+  hg commit -m "`hg log -r c956a4b140b6 --template={desc}`";
+  $ hg evolve
+  merge:[24] More addition
+  with: [22] More addition
+  base: [15] More addition
+  merging a
+  warning: conflicts during merge.
+  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
+  (/!\ You can try:
+  /!\ * manual merge + resolve => new cset X
+  /!\ * hg up to the parent of the amended changeset (which are named W and Z)
+  /!\ * hg revert --all -r X
+  /!\ * hg ci -m "same message as the amended changeset" => new cset Y
+  /!\ * hg kill -n Y W Z
+  )
+  [255]