global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 17:30:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

difftool/mergetool: add diffuse as merge and diff tool

Browse Source 
This adds diffuse as a built-in merge tool.

Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sebastian Pipping
2009-04-06 01:31:23 -07:00
committed by Junio C Hamano
parent 8b7332221d
commit 1c0f3d224e
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-mergetool.sh
View File

@@ -414,9 +414,9 @@ fi
if test -z "$merge_tool" ; then
if test -n "$DISPLAY"; then
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
merge_tool_candidates="meld kdiff3 tkdiff xxdiff tortoisemerge gvimdiff"
merge_tool_candidates="meld kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse"
else
merge_tool_candidates="kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff"
merge_tool_candidates="kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse"
fi
fi
if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then