mergetools / gvimdiff2on commit Merge branch 'sg/travis-fixes' into maint (2cd4e03)
   1. "$MERGE_TOOLS_DIR/vimdiff"