mergetools / vimdiff3on commit Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint (ebc2e5a)
   1. "$MERGE_TOOLS_DIR/vimdiff"