Merge branch 'jk/doc-diff-parallel'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"