mergetools / vimdiff3on commit Merge branch 'jt/doc-pack-objects-fix' into next (7e4c3c0)
   1. "$MERGE_TOOLS_DIR/vimdiff"