From: pudinha Date: Wed, 29 Jul 2020 21:31:11 GMT Subject: [PATCH v3 0/2] mergetools: add support for nvimdiff (neovim) family Message-ID: <20200729213113.15927-1-rogi@skylittlesystem.org> In-Reply-To: <20200719042335.3913-1-rogi@skylittlesystem.org> Junio, thanks for your time. I think I addressed all your comments regarding the commit messages. One of them is a bit long, but I saw some others are too and I'd rather have it long than not descriptive enough. Please, let me know if anything else needs changing. Best regards pudinha (2): mergetool--lib: improve support for vimdiff-style tool variants mergetools: add support for nvimdiff (neovim) family contrib/completion/git-completion.bash | 4 +-- git-mergetool--lib.sh | 35 ++++++++++++++++++++------ mergetools/bc | 5 ++++ mergetools/bc3 | 1 - mergetools/gvimdiff3 | 1 - mergetools/{gvimdiff2 => nvimdiff} | 0 mergetools/vimdiff | 21 ++++++++++++---- mergetools/vimdiff2 | 1 - mergetools/vimdiff3 | 1 - 9 files changed, 51 insertions(+), 18 deletions(-) delete mode 100644 mergetools/bc3 delete mode 100644 mergetools/gvimdiff3 rename mergetools/{gvimdiff2 => nvimdiff} (100%) delete mode 100644 mergetools/vimdiff2 delete mode 100644 mergetools/vimdiff3 -- 2.28.0