Merge branch 'ao/p4-has-branch-prefix-fix'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"