mergetools / vimdiff2on commit Merge branch 'dm/configure-iconv-locale-charset' (2f2db83)
   1. "$MERGE_TOOLS_DIR/vimdiff"