test: update conformance snapshots for merge conflict diagnostics

tasks/coverage/snapshots/parser_misc.snap

@@ -50,7 +50,7 @@ Negative Passed: 108/108 (100.00%)
  8 │ 
    ╰────
 
-  × encountered diff marker
+  × Encountered diff marker
     ╭─[misc/fail/diff-markers.js:10:1]
   9 │ function test() {
  10 │ <<<<<<< HEAD
@@ -66,11 +66,11 @@ Negative Passed: 108/108 (100.00%)
     ·    ╰── this marker concludes the conflict region
  15 │     return x;
     ╰────
-  help: conflict markers indicate that a merge was started but could not be completed due to merge conflicts
-        to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers
-        if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-        if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-        if you have nested conflicts, resolve the outermost conflict first
+  help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
+        To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
+        If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
+        If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
+        If you have nested conflicts, resolve the outermost conflict first.
 
   × Expected `,` or `]` but found `const`
    ╭─[misc/fail/imbalanced-array-expr.js:2:1]

tasks/coverage/snapshots/parser_typescript.snap

@@ -6329,7 +6329,7 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/parser/ecmasc
     ╰────
   help: Remove these parameters here
 
-  × encountered diff marker
+  × Encountered diff marker
    ╭─[typescript/tests/cases/compiler/conflictMarkerDiff3Trivia1.ts:2:1]
  1 │ class C {
  2 │ <<<<<<< HEAD
@@ -6348,13 +6348,13 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/parser/ecmasc
    ·    ╰── this marker concludes the conflict region
  9 │ }
    ╰────
-  help: conflict markers indicate that a merge was started but could not be completed due to merge conflicts
-        to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers
-        if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-        if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-        if you have nested conflicts, resolve the outermost conflict first
+  help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
+        To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
+        If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
+        If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
+        If you have nested conflicts, resolve the outermost conflict first.
 
-  × encountered diff marker
+  × Encountered diff marker
    ╭─[typescript/tests/cases/compiler/conflictMarkerDiff3Trivia2.ts:3:1]
  2 │   foo() {
  3 │ <<<<<<< B
@@ -6374,13 +6374,13 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/parser/ecmasc
     ·    ╰── this marker concludes the conflict region
  13 │ 
     ╰────
-  help: conflict markers indicate that a merge was started but could not be completed due to merge conflicts
-        to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers
-        if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-        if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-        if you have nested conflicts, resolve the outermost conflict first
+  help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
+        To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
+        If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
+        If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
+        If you have nested conflicts, resolve the outermost conflict first.
 
-  × encountered diff marker
+  × Encountered diff marker
    ╭─[typescript/tests/cases/compiler/conflictMarkerTrivia1.ts:2:1]
  1 │ class C {
  2 │ <<<<<<< HEAD
@@ -6396,13 +6396,13 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/parser/ecmasc
    ·    ╰── this marker concludes the conflict region
  7 │ }
    ╰────
-  help: conflict markers indicate that a merge was started but could not be completed due to merge conflicts
-        to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers
-        if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-        if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-        if you have nested conflicts, resolve the outermost conflict first
+  help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
+        To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
+        If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
+        If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
+        If you have nested conflicts, resolve the outermost conflict first.
 
-  × encountered diff marker
+  × Encountered diff marker
     ╭─[typescript/tests/cases/compiler/conflictMarkerTrivia2.ts:3:1]
   2 │   foo() {
   3 │ <<<<<<< B
@@ -6420,11 +6420,11 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/parser/ecmasc
     ·    ╰── this marker concludes the conflict region
  10 │ 
     ╰────
-  help: conflict markers indicate that a merge was started but could not be completed due to merge conflicts
-        to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers
-        if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-        if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-        if you have nested conflicts, resolve the outermost conflict first
+  help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
+        To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
+        If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
+        If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
+        If you have nested conflicts, resolve the outermost conflict first.
 
   × Unexpected token
    ╭─[typescript/tests/cases/compiler/conflictMarkerTrivia3.tsx:2:1]
@@ -6433,15 +6433,15 @@ Expect to Parse: tasks/coverage/typescript/tests/cases/conformance/parser/ecmasc
    · ──
    ╰────
 
-  × encountered diff marker
+  × Encountered diff marker
    ╭─[typescript/tests/cases/compiler/conflictMarkerTrivia4.ts:2:1]
  1 │ const x = <div>
  2 │ <<<<<<< HEAD
    · ───┬───
    ·    ╰── between this marker and `=======` is the code that we're merging into
    ╰────
-  help: this conflict marker appears to be incomplete (missing `=======` or `>>>>>>>`)
-        check if the conflict markers were accidentally modified or partially deleted
+  help: This conflict marker appears to be incomplete (missing `=======` or `>>>>>>>`).
+        Check if the conflict markers were accidentally modified or partially deleted.
 
   × Identifier `foo` has already been declared
    ╭─[typescript/tests/cases/compiler/conflictingTypeAnnotatedVar.ts:1:5]