mergetools / gvimdiffon commit Merge branch 'tb/trace2-va-list-fix' (e9bd21c)
   1. "$MERGE_TOOLS_DIR/vimdiff"