Tweak wording

[rust.git] / src / test / ui / parser / diff-markers / trait-item.stderr

diff --git a/src/test/ui/parser/diff-markers/trait-item.stderr b/src/test/ui/parser/diff-markers/trait-item.stderr
index 8e18d5db7c745b10840d7ccedae6e72b75bf4b5a..cdc19f8e0765a38be671184a61c5a42d0b3471d4 100644 (file)
--- a/src/test/ui/parser/diff-markers/trait-item.stderr
+++ b/src/test/ui/parser/diff-markers/trait-item.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/trait-item.rs:2:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |     fn foo() {}
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |     fn bar() {}
 LL | >>>>>>> branch
-   | ^^^^^^^ end
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: 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
+   = 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