Tk Source Code

Help: gmerge-command
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2018 Conference, Houston/TX, US, Oct 15-19
Send your abstracts to tclconference@googlegroups.com or submit via the online form
by Aug 20.

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"