mergetools / vimdiff2on commit utf8.c: partially update to version 6.3 (d813ab9)
   1. "$MERGE_TOOLS_DIR/vimdiff"