mergetools / vimdiff2on commit Merge branch 'ls/travis-yaml' (9eb2449)
   1. "$MERGE_TOOLS_DIR/vimdiff"