Feature request: Configure (visual) diff tool for conflict resolution

[ugumba]

The conflict detection is a great feature, no doubt - but cleaning up the conflicts can still be a drag.

While I'm OK with "Show in folder", combined with having Araxis Merge in my "Send to..." context menu, it would be superb if SyncTrayzor could be configured with a diff tool (Araxis, P4Diff, WinMerge, ... the user provides the command line).
The user then updates the "key" file if desired (i.e. the one not tagged "conflict").
When the tool closes, ask the user if the "conflict" files can now be deleted, and the conflict considered resolved.

[canton7]

I was considering this when I was implementing the conflict resolution, but never got around to it.

[endolith]

+1 Please let us specify a command line to open up both files in an external diff tool like WinMerge or Meld.

[ttimasdf]

+1 an option to invoke WinMerge is good enough IMHO

[ooker777]

@canton7 if you don't have time for this, perhaps can you tell how do you use diff in these situation?

[ugumba]

Sorry, I've not been using Syncthing for years now, so I'm out.

[endolith]

@ooker777 use WinMerge or Meld to compare the sync conflict file with the original. Make them both equal and then delete the sync conflict file