Fix rebase

Author: estebank

src/test/ui/track-diagnostics/track2.stderr

@@ -7,6 +7,11 @@ LL |     let _moved @ _from = String::from("foo");
    |         |        value moved here
    |         value used here after move
 -Ztrack-diagnostics: created at compiler/rustc_borrowck/src/borrowck_errors.rs:LL:CC
+   |
+help: borrow this binding in the pattern to avoid moving the value
+   |
+LL |     let _moved @ ref _from = String::from("foo");
+   |                  +++
 
 error: aborting due to previous error