branch | stable |
changeset 18873 | 8a7bd2dccd44 |
parent 18505 | 9de9727cea53 |
child 18876 | f63035b9b38a |
--- a/mercurial/merge.py Tue Apr 02 16:03:10 2013 +0200 +++ b/mercurial/merge.py Mon Mar 18 16:37:20 2013 -0500 @@ -382,11 +382,11 @@ (f, inst.strerror)) removed += 1 elif m == "m": # merge + f2, fd, move = a[2:] if fd == '.hgsubstate': # subrepo states need updating subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite) continue - f2, fd, move = a[2:] audit(fd) r = ms.resolve(fd, wctx, mctx) if r is not None and r > 0: