[Cowlark Logo] cowlark.com

thickishstring

Help: gmerge-command

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 "%output"
Fossil version [8be0372c10] 2024-04-23 13:25:26 © 2008-2012 David Given, unless specified otherwise