--- a/hgext/evolve.py	Thu Aug 30 13:50:17 2012 +0200
+++ b/hgext/evolve.py	Thu Aug 30 13:54:43 2012 +0200
@@ -1574,8 +1574,14 @@
             repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                              "or 'hg update -C .' to abandon\n"))
         if stats[3] > 0:
-            raise util.Abort('GASP! Merge Conflict! You are on you own chap!',
-                hint='/!\\ hg evolve --continue will NOT work /!\\')
+            raise util.Abort('Merge conflict between several amendments, and this is not yet automated',
+                hint="""/!\ 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
+""")
         tr = repo.transaction('stabilize-conflicting')
         try:
             repo.dirstate.setparents(conflicting.node(), node.nullid)