equal
deleted
inserted
replaced
327 elif m == "m": # merge |
327 elif m == "m": # merge |
328 if f == '.hgsubstate': # subrepo states need updating |
328 if f == '.hgsubstate': # subrepo states need updating |
329 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite) |
329 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite) |
330 continue |
330 continue |
331 f2, fd, flags, move = a[2:] |
331 f2, fd, flags, move = a[2:] |
|
332 repo.wopener.audit(fd) |
332 r = ms.resolve(fd, wctx, mctx) |
333 r = ms.resolve(fd, wctx, mctx) |
333 if r is not None and r > 0: |
334 if r is not None and r > 0: |
334 unresolved += 1 |
335 unresolved += 1 |
335 else: |
336 else: |
336 if r is None: |
337 if r is None: |