Merge branch 'sk/gitweb-highlight-encoding'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"