mergetools / vimdiff3on commit Merge branch 'np/log-graph-octopus-fix' (0ffa31f)
   1. "$MERGE_TOOLS_DIR/vimdiff"