Merge branch 'jk/prune-top-level-refs-after-packing' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"