diff -r 744db7a27dd0 -r 87c41ef95ebf hgext/evolve.py
--- a/hgext/evolve.py	Wed Aug 29 11:58:21 2012 +0200
+++ b/hgext/evolve.py	Thu Aug 30 13:50:17 2012 +0200
@@ -1546,7 +1546,7 @@
         displayer.show(base)
     if dryrun:
         ui.write('hg update -c %s &&\n' % conflicting)
-        ui.write('hg merge %s && \n' % other)
+        ui.write('hg merge %s &&\n' % other)
         ui.write('hg commit -m "auto merge resolving conflict between '
                  '%s and %s"&&\n' % (conflicting, other))
         ui.write('hg up -C %s &&\n' % base)