J6502's Logo. J6502

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"

© Copyright J6502. All rights reserved.

Served by Fossil 2.24 with love <3

RSS