mergetools / gvimdiffon commit Merge branch 'jk/diff-highlight-graph-fix' into next (eb995f6)
   1. "$MERGE_TOOLS_DIR/vimdiff"