mergetools / vimdiff2on commit diff: parse ws-error-highlight option more strictly (3f4f17b)
   1. "$MERGE_TOOLS_DIR/vimdiff"