mergetools / vimdiff2on commit t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1 (14332bc)
   1. "$MERGE_TOOLS_DIR/vimdiff"