From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Aug 2020 00:02:43 +0000 (-0700)
Subject: Merge branch 'pd/mergetool-nvimdiff'
X-Git-Tag: v2.29.0-rc0~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=873fa13e3fd7c2644578577f4274ce92ed891a42;p=thirdparty%2Fgit.git

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
---

873fa13e3fd7c2644578577f4274ce92ed891a42