mergetools / vimdiff2on commit Merge branch 'sg/travis-retrieve-trash-upon-failure' (6be44b5)
   1. "$MERGE_TOOLS_DIR/vimdiff"