mergetools / vimdiff3on commit Merge branch 'es/utf8-stupid-compiler-workaround' (5d24b10)
   1. "$MERGE_TOOLS_DIR/vimdiff"