]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 95c687b 1186897)
Merge branch 'pd/mergetool-nvimdiff'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Aug 2020 00:02:43 +0000 (17:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Aug 2020 00:02:43 +0000 (17:02 -0700)
commit873fa13e3fd7c2644578577f4274ce92ed891a42
treed5639f27b72e56e6a3e8399203a61073e4d62688tree | snapshot
parent95c687bf85b1922cc4b8c441cd8aeb4048977001commit | diff
parent11868978c7c80d3c29071b29e7964e3d62523819commit | 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
contrib/completion/git-completion.bash diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.