mergetools / vimdiff2on commit drop some obsolete "x = x" compiler warning hacks (cbfd5e1)
   1. "$MERGE_TOOLS_DIR/vimdiff"