tree f6c95ee9d4216724dab20c6b17992965d423abe1
parent 09e72204f87db7226af97b12beff6774946af71b
parent 30bb8088afd4502acd2e166ddf7e4b071e53b86d
author Junio C Hamano <gitster@pobox.com> 1614300212 -0800
committer Junio C Hamano <gitster@pobox.com> 1614300212 -0800

Merge branch 'sh/mergetools-vimdiff1'

Mergetools update.

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