equal
deleted
inserted
replaced
1012 |
1012 |
1013 if usemergedriver and not unresolved and ms.mdstate() != 's': |
1013 if usemergedriver and not unresolved and ms.mdstate() != 's': |
1014 if not driverconclude(repo, ms, wctx, labels=labels): |
1014 if not driverconclude(repo, ms, wctx, labels=labels): |
1015 # XXX setting unresolved to at least 1 is a hack to make sure we |
1015 # XXX setting unresolved to at least 1 is a hack to make sure we |
1016 # error out |
1016 # error out |
1017 return updated, merged, removed, max(unresolved, 1) |
1017 unresolved = max(unresolved, 1) |
1018 |
1018 |
1019 ms.commit() |
1019 ms.commit() |
1020 |
1020 |
1021 progress(_updating, None, total=numupdates, unit=_files) |
1021 progress(_updating, None, total=numupdates, unit=_files) |
1022 |
1022 |