Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"