diff options
| author |  Sebastian Pipping <sebastian@pipping.org> | 2009-04-06 01:31:23 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:56 -0700 |
| commit | 1c0f3d224eff2ff8ca8442811edb5a6830adba1a (patch) | |
| tree | ea2abaf978b348dc99b31a304381e6146cdc5c9a /contrib/completion | |
| parent | difftool: add a -y shortcut for --no-prompt (diff) | |
| download | tgif-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.tar.xz | |
difftool/mergetool: add diffuse as merge and diff tool
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>
Diffstat (limited to 'contrib/completion')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d3d8203171..e099ed48ff 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 ;; |