mergetools / vimdiff3on commit Merge branch 'es/utf8-stupid-compiler-workaround' into maint (71a8af6)
   1. "$MERGE_TOOLS_DIR/vimdiff"