Merge branch 'bc/run-command-nullness-after-free-fix' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"