Merge branch 'mr/doc-clean-f-f' into maint
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"