diff -r 654b9e1966f7 -r 525fdb738975 mercurial/merge.py
--- a/mercurial/merge.py	Fri May 11 18:41:04 2012 +0200
+++ b/mercurial/merge.py	Sat May 12 15:54:54 2012 +0200
@@ -363,7 +363,8 @@
             removed += 1
         elif m == "m": # merge
             if f == '.hgsubstate': # subrepo states need updating
-                subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite)
+                subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
+                                 overwrite)
                 continue
             f2, fd, flags, move = a[2:]
             repo.wopener.audit(fd)