Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

stable wctxactions: pass absolute paths to commands.resolve() (closes #747)

Changeset e4e367dc1d59

Parent 62eb6590c499

by Steve Borho

Changes to one file · Browse files at e4e367dc1d59 Showing diff from parent 62eb6590c499 Diff from another changeset...

 
341
342
343
344
 
 
345
 
341
342
343
 
344
345
346
@@ -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