mergetools / gvimdiff2on commit Merge branch 'ma/ts-cleanups' into next (e0e8cc5)
   1. "$MERGE_TOOLS_DIR/vimdiff"