equal
deleted
inserted
replaced
5326 # replace filemerge's .orig file with our resolve file |
5326 # replace filemerge's .orig file with our resolve file |
5327 util.rename(a + ".resolve", a + ".orig") |
5327 util.rename(a + ".resolve", a + ".orig") |
5328 |
5328 |
5329 ms.commit() |
5329 ms.commit() |
5330 |
5330 |
5331 if not didwork and pats: |
5331 if not didwork and pats and not show: |
5332 ui.warn(_("arguments do not match paths that need resolving\n")) |
5332 ui.warn(_("arguments do not match paths that need resolving\n")) |
5333 |
5333 |
5334 finally: |
5334 finally: |
5335 wlock.release() |
5335 wlock.release() |
5336 |
5336 |