mergetools / bc3on commit Merge branch 'jk/diffcore-rename-duplicate' into maint (3aab60b)
   1. "$MERGE_TOOLS_DIR/bc"