From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2021 00:43:32 +0000 (-0800)
Subject: Merge branch 'sh/mergetools-vimdiff1'
X-Git-Tag: v2.31.0-rc0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cadae717d557840d3566b7c0fc2003046e08c88f;p=thirdparty%2Fgit.git

Merge branch 'sh/mergetools-vimdiff1'

Mergetools update.

* sh/mergetools-vimdiff1:
  mergetools/vimdiff: add vimdiff1 merge tool variant
---

cadae717d557840d3566b7c0fc2003046e08c88f