mercurial/filemerge.py
changeset 35829 c87926ebe096
parent 35703 9a50ffd15b25
child 35907 9037c29e9f53
equal deleted inserted replaced
35828:553a98a436cf 35829:c87926ebe096
   527         if "$output" in args:
   527         if "$output" in args:
   528             # read input from backup, write to original
   528             # read input from backup, write to original
   529             out = a
   529             out = a
   530             a = repo.wvfs.join(back.path())
   530             a = repo.wvfs.join(back.path())
   531         replace = {'local': a, 'base': b, 'other': c, 'output': out}
   531         replace = {'local': a, 'base': b, 'other': c, 'output': out}
   532         args = util.interpolate(r'\$', replace, args,
   532         args = util.interpolate(br'\$', replace, args,
   533                                 lambda s: util.shellquote(util.localpath(s)))
   533                                 lambda s: util.shellquote(util.localpath(s)))
   534         cmd = toolpath + ' ' + args
   534         cmd = toolpath + ' ' + args
   535         if _toolbool(ui, tool, "gui"):
   535         if _toolbool(ui, tool, "gui"):
   536             repo.ui.status(_('running merge tool %s for file %s\n') %
   536             repo.ui.status(_('running merge tool %s for file %s\n') %
   537                            (tool, fcd.path()))
   537                            (tool, fcd.path()))