chore: Prover.tomls fix (#11011)

Follow-up of #10608:

- Changes re-gen instructions to match new way of running e2es
- Adds missing block-merge option
- Re-gens `Prover.toml`s (since I'm testing the re-gen code anyway!)

yarn-project/end-to-end/src/e2e_prover/full.test.ts

@@ -256,6 +256,7 @@ describe('full_prover', () => {
       'rollup-base-public',
       'rollup-merge',
       'rollup-block-root',
+      'rollup-block-merge',
       'rollup-root',
     ].forEach(circuitName => {
       const data = getTestData(circuitName);

yarn-project/foundation/src/testing/files/index.ts

@@ -42,8 +42,8 @@ export function updateInlineTestData(targetFileFromRepoRoot: string, itemName: s
 
 /**
  * Updates the sample Prover.toml files in noir-projects/noir-protocol-circuits/crates/.
- * @remarks Requires AZTEC_GENERATE_TEST_DATA=1 & generateProtocolCircuitTestData=true to be set
- * To re-gen, run 'AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn workspace @aztec/end-to-end test full.test'
+ * @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set
+ * To re-gen, run 'AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn test:e2e-no-docker full.test '
  */
 export function updateProtocolCircuitSampleInputs(circuitName: string, value: string) {
   const logger = createConsoleLogger('aztec:testing:test_data');