mergetools / gvimdiff3on commit Merge branch 'es/make-no-iconv' (da34dd4)
   1. "$MERGE_TOOLS_DIR/vimdiff"