![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Theodore Ts'o <tytso@mit.edu> | |
| Sun, 10 Jun 2007 15:17:30 +0000 (11:17 -0400) | ||
| committer | Theodore Ts'o <tytso@mit.edu> | |
| Sun, 10 Jun 2007 15:17:30 +0000 (11:17 -0400) | ||
| commit | 301ac38b12126133445d544f7cc5d65768b9310f | |
| tree | b4ed00b6880b2f118b93baeb28e6a0301c083db2 | tree | snapshot |
| parent | 730b5b45fb8a7751106885d350466c197b671b1c | commit | diff |
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>
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>
| git-mergetool.sh | diff | blob | history |