mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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

3
contrib/completion/git-completion.bash
View File

@ -1174,7 +1174,8 @@ _git_mergetool ()
--tool=*)
__gitcomp "
kdiff3 tkdiff meld xxdiff emerge
vimdiff gvimdiff ecmerge opendiff
vimdiff gvimdiff ecmerge diffuse
opendiff
" "" "${cur##--tool=}"
return
;;