diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:43 -0700 |
| commit | 873fa13e3fd7c2644578577f4274ce92ed891a42 (patch) | |
| tree | d5639f27b72e56e6a3e8399203a61073e4d62688 /builtin/commit.c | |
| 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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions