mergetools / gvimdiff2on commit Merge branch 'ds/commit-graph-incremental' (92b1ea6)
   1. "$MERGE_TOOLS_DIR/vimdiff"