Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"