Merge branch 'ls/t0021-fixup'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"