Theodore Ts'o 301ac38b12 git-mergetool: Make default selection of merge-tool more intelligent ...

Make git-mergetool prefer meld under GNOME, and kdiff3 under KDE.  When
considering emerge and vimdiff, check $VISUAL and $EDITOR to see which the
user might prefer.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Josh Triplett <josh@freedesktop.org>

2007-06-10 11:17:30 -04:00

8.4 KiB

Executable File

Raw Blame History

View Raw