mergetools / gvimdiff2on commit travis-ci: update Git-LFS and P4 to the latest version (31f3c86)
   1. "$MERGE_TOOLS_DIR/vimdiff"