mergetools / bc3on commit Merge branch 'jk/type-from-string-gently' into maint (c1c4a87)
   1. "$MERGE_TOOLS_DIR/bc"