Merge branch 'sh/mergetools-vimdiff1'
Mergetools update. * sh/mergetools-vimdiff1: mergetools/vimdiff: add vimdiff1 merge tool variant
Junio C Hamano committed
Feb 25, 2021 at 16:43 UTC
cadae717d557840d3566b7c0fc2003046e08c88f
No changes.