mergetools / gvimdiffon commit Merge branch 'jh/trace2-pretty-output' (93fc876)
   1. "$MERGE_TOOLS_DIR/vimdiff"