Merge branch 'ah/doc-gitattributes-empty-index' into maint
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"