Merge branch 'ws/grep-quiet-no-pager'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"