]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sh/mergetools-vimdiff1'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2021 00:43:32 +0000 (16:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2021 00:43:32 +0000 (16:43 -0800)
Mergetools update.

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


Trivial merge