diff options
| author |  Theodore Ts'o <tytso@mit.edu> | 2007-06-10 11:17:30 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-06-10 11:17:30 -0400 |
| commit | 301ac38b12126133445d544f7cc5d65768b9310f (patch) | |
| tree | b4ed00b6880b2f118b93baeb28e6a0301c083db2 /.gitignore | |
| parent | [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool (diff) | |
| download | tgif-301ac38b12126133445d544f7cc5d65768b9310f.tar.xz | |
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