Merge tag 'v2.7.0'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"