mergetools / gvimdiff2on commit Merge branch 'ep/trace-doc-sample-fix' (b330051)
   1. "$MERGE_TOOLS_DIR/vimdiff"