---

yaml
---
r: 129951
b: refs/heads/try
c: a40e2a6
h: refs/heads/master
i:
  129949: 6384a52
  129947: 681f983
  129943: b1adc92
  129935: c6e13e2
  129919: 632c83d
v: v3

Author: bkoropoff

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0bdac78da87605f6f7f6e7924872617226b19c85
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 602592675ce86aeca465c4ac748cee2bff291443
-refs/heads/try: e0cfe10aad151211fdb6fedaad44334400a37d06
+refs/heads/try: a40e2a6463f972f687ab7e3636ba8c5595d9877c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/test/compile-fail/resolve-conflict-import-vs-extern-crate.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::slice as std; //~ ERROR import conflicts with imported crate
+use std::slice as std; //~ ERROR import `std` conflicts with imported crate
 
 fn main() {
 }

branches/try/src/test/compile-fail/resolve-conflict-item-vs-import.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use std::mem::transmute;
-//~^ ERROR import conflicts with value in this module
+//~^ ERROR import `transmute` conflicts with value in this module
 
 fn transmute() {}