Merge branch 'mh/avoid-rewriting-packed-refs' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"