]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commitcadae717d557840d3566b7c0fc2003046e08c88f
treef6c95ee9d4216724dab20c6b17992965d423abe1
parent09e72204f87db7226af97b12beff6774946af71b
parent30bb8088afd4502acd2e166ddf7e4b071e53b86d
Merge branch 'sh/mergetools-vimdiff1'

Mergetools update.

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