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

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.