mergetools / vimdiff2on commit Merge branch 'es/first-contrib-tutorial' (55b34f3)
   1. "$MERGE_TOOLS_DIR/vimdiff"