mergetools / vimdiff3on commit Merge branch 'sg/object-as-type-commit-graph-fix' (2ed3de4)
   1. "$MERGE_TOOLS_DIR/vimdiff"