summaryrefslogtreecommitdiff
path: root/tests/ui/parser/diff-markers/fn-arg.stderr
diff options
context:
space:
mode:
authorNilstrieb <48135649+Nilstrieb@users.noreply.github.com>2023-11-21 15:44:16 +0000
committerNilstrieb <48135649+Nilstrieb@users.noreply.github.com>2023-11-24 19:15:52 +0100
commit41e8d152dc5abb5a706999ada8b059d3420af8f3 (patch)
tree2dae41c4e26e0195b5bd3472beac0445c8014915 /tests/ui/parser/diff-markers/fn-arg.stderr
parent4fd68eb47bad1c121417ac4450b2f0456150db86 (diff)
Show number in error message even for one error
Co-authored-by: Adrian <adrian.iosdev@gmail.com>
Diffstat (limited to 'tests/ui/parser/diff-markers/fn-arg.stderr')
-rw-r--r--tests/ui/parser/diff-markers/fn-arg.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ui/parser/diff-markers/fn-arg.stderr b/tests/ui/parser/diff-markers/fn-arg.stderr
index 933a206410e..aabcb826c12 100644
--- a/tests/ui/parser/diff-markers/fn-arg.stderr
+++ b/tests/ui/parser/diff-markers/fn-arg.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