chicken-tweetnacl

Help: gmerge-command
Login

Help: gmerge-command

Command-List

SQLITE_NOTICE(539): recovered 3 pages from /srv/repos/chicken-tweetnacl.fossil-journal

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"