Tweak wording

11 files changed, 77 insertions, 33 deletions

diff --git a/src/test/ui/parser/diff-markers/enum-2.stderr b/src/test/ui/parser/diff-markers/enum-2.stderr
index 5264a596488..4e612a5427a 100644
--- a/src/test/ui/parser/diff-markers/enum-2.stderr
+++ b/src/test/ui/parser/diff-markers/enum-2.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/enum-2.rs:3:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |         x: u8,
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |         x: i8,
 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
 
diff --git a/src/test/ui/parser/diff-markers/enum.stderr b/src/test/ui/parser/diff-markers/enum.stderr
index 6bdc20d3cd3..abbf3fb41e7 100644
--- a/src/test/ui/parser/diff-markers/enum.stderr
+++ b/src/test/ui/parser/diff-markers/enum.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/enum.rs:2:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |     Foo(u8),
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |     Bar(i8),
 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
 
diff --git a/src/test/ui/parser/diff-markers/fn-arg.stderr b/src/test/ui/parser/diff-markers/fn-arg.stderr
index 4a816ff75bc..933a206410e 100644
--- a/src/test/ui/parser/diff-markers/fn-arg.stderr
+++ b/src/test/ui/parser/diff-markers/fn-arg.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/fn-arg.rs:3:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |         x: u8,
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |         x: i8,
 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
 
diff --git a/src/test/ui/parser/diff-markers/item-with-attr.stderr b/src/test/ui/parser/diff-markers/item-with-attr.stderr
index 4fcb782846e..850e2368e55 100644
--- a/src/test/ui/parser/diff-markers/item-with-attr.stderr
+++ b/src/test/ui/parser/diff-markers/item-with-attr.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/item-with-attr.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
 
diff --git a/src/test/ui/parser/diff-markers/item.stderr b/src/test/ui/parser/diff-markers/item.stderr
index 7c81f0fafa6..9ab3631a60e 100644
--- a/src/test/ui/parser/diff-markers/item.stderr
+++ b/src/test/ui/parser/diff-markers/item.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/item.rs:1: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
 
diff --git a/src/test/ui/parser/diff-markers/statement.stderr b/src/test/ui/parser/diff-markers/statement.stderr
index 4c821c02f0d..7ca2495b829 100644
--- a/src/test/ui/parser/diff-markers/statement.stderr
+++ b/src/test/ui/parser/diff-markers/statement.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/statement.rs:10:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |     S::foo();
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |     S::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
 
diff --git a/src/test/ui/parser/diff-markers/struct-expr.stderr b/src/test/ui/parser/diff-markers/struct-expr.stderr
index 0ddb1a301e3..d70476a9833 100644
--- a/src/test/ui/parser/diff-markers/struct-expr.stderr
+++ b/src/test/ui/parser/diff-markers/struct-expr.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/struct-expr.rs:6:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |         x: 42,
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |         x: 0,
 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
 
diff --git a/src/test/ui/parser/diff-markers/struct.stderr b/src/test/ui/parser/diff-markers/struct.stderr
index e47bcfdaedc..cc0b3da664e 100644
--- a/src/test/ui/parser/diff-markers/struct.stderr
+++ b/src/test/ui/parser/diff-markers/struct.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/struct.rs:2:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |     x: u8,
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |     x: i8,
 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
 
diff --git a/src/test/ui/parser/diff-markers/trait-item.stderr b/src/test/ui/parser/diff-markers/trait-item.stderr
index 8e18d5db7c7..cdc19f8e076 100644
--- 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
 
diff --git a/src/test/ui/parser/diff-markers/tuple-struct.stderr b/src/test/ui/parser/diff-markers/tuple-struct.stderr
index 7f30cbcc1f7..d673db89837 100644
--- a/src/test/ui/parser/diff-markers/tuple-struct.stderr
+++ b/src/test/ui/parser/diff-markers/tuple-struct.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/tuple-struct.rs:2:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |     u8,
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |     i8,
 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
 
diff --git a/src/test/ui/parser/diff-markers/use-statement.stderr b/src/test/ui/parser/diff-markers/use-statement.stderr
index 818c90aa59b..12e6f57dd50 100644
--- a/src/test/ui/parser/diff-markers/use-statement.stderr
+++ b/src/test/ui/parser/diff-markers/use-statement.stderr
@@ -2,13 +2,17 @@ error: encountered diff marker
   --> $DIR/use-statement.rs:2:1
    |
 LL | <<<<<<< HEAD
-   | ^^^^^^^ start
+   | ^^^^^^^ after this is the code before the merge
 LL |     bar,
 LL | =======
-   | ^^^^^^^ middle
+   | -------
 LL |     baz,
 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