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