diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-06-10 15:17:30 (GMT) |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-06-10 15:17:30 (GMT) |
| commit | 301ac38b12126133445d544f7cc5d65768b9310f (patch) | |
| tree | b4ed00b6880b2f118b93baeb28e6a0301c083db2 /.gitignore | |
| parent | 730b5b45fb8a7751106885d350466c197b671b1c (diff) | |
| download | git-301ac38b12126133445d544f7cc5d65768b9310f.zip git-301ac38b12126133445d544f7cc5d65768b9310f.tar.gz git-301ac38b12126133445d544f7cc5d65768b9310f.tar.bz2 | |
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>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions