Merge branch 'ab/sha1dc-maint'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"