mergetools / bc3on commit Merge branch 'sg/t6050-failing-editor-test-fix' into maint (0298675)
   1. "$MERGE_TOOLS_DIR/bc"