Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'uk/ls-remote-in-get-remote-url'
[gitweb.git]
/
contrib
/
completion
/
git-completion.bash
diff --git
a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 0b0b913d287f5d70f8f8fdce5f16335dd1c6f9ec..ccdc172a06bcc55ff5c5c3c1854bb34f84910f90 100755
(executable)
--- a/
contrib/completion/git-completion.bash
+++ b/
contrib/completion/git-completion.bash
@@
-1360,7
+1360,7
@@
_git_diff ()
}
__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge
+ tkdiff vimdiff gvimdiff xxdiff araxis p4merge
bc3
"
_git_difftool ()