Merge branch 'ab/test-must-be-empty-for-master'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"