mergetools / gvimdiff3on commit Merge branch 'np/log-graph-octopus-fix' into maint (a51c638)
   1. "$MERGE_TOOLS_DIR/vimdiff"