equal
deleted
inserted
replaced
6080 break |
6080 break |
6081 ui.warn(_(b"arguments do not match paths that need resolving\n")) |
6081 ui.warn(_(b"arguments do not match paths that need resolving\n")) |
6082 if hint: |
6082 if hint: |
6083 ui.warn(hint) |
6083 ui.warn(hint) |
6084 |
6084 |
6085 unresolvedf = list(ms.unresolved()) |
6085 unresolvedf = ms.unresolvedcount() |
6086 if not unresolvedf: |
6086 if not unresolvedf: |
6087 ui.status(_(b'(no more unresolved files)\n')) |
6087 ui.status(_(b'(no more unresolved files)\n')) |
6088 cmdutil.checkafterresolved(repo) |
6088 cmdutil.checkafterresolved(repo) |
6089 |
6089 |
6090 return ret |
6090 return ret |