- subprocess.call([self.merge_tool, full_filename + '.local',
- full_filename + '.remote', '-o', full_filename + '.merge'])
+ merge_command = self.merge_tool % (full_filename + '.local',
+ full_filename + '.remote', full_filename + '.merge')
+ subprocess.call(merge_command.split(' '))