Changeset e4e367dc1d59…
Parent 62eb6590c499…
by
Changes to one file · Browse files at e4e367dc1d59 Showing diff from parent 62eb6590c499 Diff from another changeset...
@@ -341,5 +341,6 @@
def resolve_with(tool, repo, files):
opts = {'tool': tool}
- commands.resolve(repo.ui, repo, *files, **opts)
+ paths = [repo.wjoin(f) for f in files]
+ commands.resolve(repo.ui, repo, *paths, **opts)
return True
|
Loading...