equal
deleted
inserted
replaced
4993 util.rename(a + ".resolve", a + ".orig") |
4993 util.rename(a + ".resolve", a + ".orig") |
4994 |
4994 |
4995 ms.commit() |
4995 ms.commit() |
4996 |
4996 |
4997 if not didwork and pats: |
4997 if not didwork and pats: |
4998 ui.warn(_("arguments do not match paths that need resolved\n")) |
4998 ui.warn(_("arguments do not match paths that need resolving\n")) |
4999 |
4999 |
5000 finally: |
5000 finally: |
5001 wlock.release() |
5001 wlock.release() |
5002 |
5002 |
5003 # Nudge users into finishing an unfinished operation. We don't print |
5003 # Nudge users into finishing an unfinished operation. We don't print |