mergetools / vimdiff2on commit travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output (4f26366)
   1. "$MERGE_TOOLS_DIR/vimdiff"