diff options
Diffstat (limited to 'tests/ui/parser/diff-markers/statement.stderr')
| -rw-r--r-- | tests/ui/parser/diff-markers/statement.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ui/parser/diff-markers/statement.stderr b/tests/ui/parser/diff-markers/statement.stderr index 7ca2495b8..c6c6cae87 100644 --- a/tests/ui/parser/diff-markers/statement.stderr +++ b/tests/ui/parser/diff-markers/statement.stderr @@ -14,5 +14,5 @@ LL | >>>>>>> branch = help: 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 = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts> -error: aborting due to previous error +error: aborting due to 1 previous error |