mergetools / gvimdiffon commit Merge branch 'ds/commit-graph-octopus-fix' (3bcedae)
   1. "$MERGE_TOOLS_DIR/vimdiff"