Help: gmerge-command
Tcl 2014 Conference, Portland/OR, US, Nov 10-14
Send your abstracts to tclconference@googlegroups.com by Sep 8.

The "gmerge-command" setting:

The value is a graphical merge conflict resolver command operating
on four files.  Examples:

    kdiff3 "%baseline" "%original" "%merge" -o "%output"
    xxdiff "%original" "%baseline" "%merge" -M "%output"
    meld "%baseline" "%original" "%merge" "%output"