Mercurial > hg

diff mercurial/merge.py @ 16683:525fdb738975

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: eradicate long lines
author Brodie Rao <brodie@sf.io>
date Sat, 12 May 2012 15:54:54 +0200
parents ebf6d38c9063
children d1afbf03e69a
line wrap: on
line diff
--- 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)