mergetools / vimdiff2on commit Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint (03969df)
   1. "$MERGE_TOOLS_DIR/vimdiff"