diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-18 03:02:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-18 03:02:43 +0300 |
| commit | 873fa13e3fd7c2644578577f4274ce92ed891a42 (patch) | |
| tree | d5639f27b72e56e6a3e8399203a61073e4d62688 /contrib | |
| parent | 95c687bf85b1922cc4b8c441cd8aeb4048977001 (diff) | |
| parent | 11868978c7c80d3c29071b29e7964e3d62523819 (diff) | |
Merge branch 'pd/mergetool-nvimdiff'
The existing backends for "git mergetool" based on variants of vim
have been refactored and then support for "nvim" has been added.
* pd/mergetool-nvimdiff:
mergetools: add support for nvimdiff (neovim) family
mergetool--lib: improve support for vimdiff-style tool variants
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0fdb5da83b..700d44af5b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1712,8 +1712,8 @@ _git_diff () } __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff - tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc - codecompare smerge + tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge + bc codecompare smerge " _git_difftool () |