Merge branch 'sb/submodule-short-status' into next
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"