mergetools / gvimdiff2on commit Merge branch 'ls/travis-submitting-patches' into HEAD (0968758)
   1. "$MERGE_TOOLS_DIR/vimdiff"