mergetools / bc3on commit Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint (74419c2)
   1. "$MERGE_TOOLS_DIR/bc"