index ca3dbd2465f9c33f450f9d7bfb9d60206ef509ae..6e2610cda6d2721eb4fb9ac063bb47ef80bfbae3 100644 (file)
--tool=<tool>::
Use the merge resolution program specified by <tool>.
Valid merge tools are:
--tool=<tool>::
Use the merge resolution program specified by <tool>.
Valid merge tools are:
- kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
+ kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
+ vimdiff, gvimdiff, ecmerge, and opendiff
+
If a merge resolution program is not specified, 'git-difftool'
will use the configuration variable `merge.tool`. If the
+
If a merge resolution program is not specified, 'git-difftool'
will use the configuration variable `merge.tool`. If the