mergetools / gvimdiff3on commit Merge branch 'ls/travis-homebrew-path-fix' into maint (d2a4131)
   1. "$MERGE_TOOLS_DIR/vimdiff"