Home/ Questions/Q 65897
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-10T19:01:06+00:00

I have TortoiseSVN set up to use KDiff3 as the conflict resolution tool (I

  • 0

I have TortoiseSVN set up to use KDiff3 as the conflict resolution tool (I find it shows more information useful to the merge than the built-in TortoiseMerge does).

When I open a file with Tortoise’s ‘Edit Conflicts’ command it shows me the three files and I have to select ‘Merge->Merge Current File’ manually. The problem is that KDiff3 saves the result to source_file.working instead of to source_file. So without doing a Save As, the real file with the conflict doesn’t get modified. Is there a way around doing this manual Save As every time?

I know this isn’t strictly a programming question but it’s about an ancillary process common enough to programmers that it should be useful here. I couldn’t find the answer to this elsewhere.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Mine is a bit longer:

    'C:\Program Files\KDiff3\kdiff3.exe' %base %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs
    • 0