Merge branch 'rs/grep-color-words'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"