mergetools / gvimdiff2on commit regex: fix a SIZE_MAX macro redefinition warning (bd8f005)
   1. "$MERGE_TOOLS_DIR/vimdiff"