mergetools / vimdiff3on commit Merge branch 'jc/diff-tree-stale-comment' into maint (b960cd3)
   1. "$MERGE_TOOLS_DIR/vimdiff"