git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95c687b 1186897)
Merge branch 'pd/mergetool-nvimdiff'
authorJunio C Hamano <redacted>
Tue, 18 Aug 2020 00:02:43 +0000 (17:02 -0700)
committerJunio C Hamano <redacted>
Tue, 18 Aug 2020 00:02:43 +0000 (17:02 -0700)
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

1  2 
contrib/completion/git-completion.bash patch | diff1 | diff2 | blob | history

git clone https://git.99rst.org/PROJECT