mergetools / gvimdiff2on commit upload-pack: replace use of several hard-coded constants (55dc227)
   1. "$MERGE_TOOLS_DIR/vimdiff"