Merge branch 'sb/submodule-config-doc-drop-path' into maint
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"