mergetools / bc3on commit Merge branch 'jk/fast-import-die-nicely-fix' into maint (4e0d620)
   1. "$MERGE_TOOLS_DIR/bc"