29
29
Use the merge resolution program specified by <tool>.
31
araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
32
meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
30
Valid values include emerge, gvimdiff, kdiff3,
34
34
If a merge resolution program is not specified, 'git mergetool'
35
35
will use the configuration variable `merge.tool`. If the