---

yaml
---
r: 276170
b: refs/heads/master
c: 790043b
h: refs/heads/master

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8a9ad72c1d67261049aac1d067529da48adcc644
+refs/heads/master: 790043b44e0c078c0f80b16cd03d1aeac6ef242b
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/libsyntax/errors/emitter.rs

@@ -555,7 +555,7 @@ mod test {
         let str = from_utf8(vec).unwrap();
         println!("r#\"\n{}\"#", str);
         assert_eq!(str, &r#"
-   --> dummy.txt:11:1
+  --> dummy.txt:11:1
 11 |>         e-lä-vän
    |> ^
 "#[1..]);

trunk/src/libsyntax/errors/snippet/test.rs

@@ -404,7 +404,7 @@ impl SomeTrait for () {
     let text: String = make_string(&lines);
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
->>>>>> foo.rs
+>>>> foo.rs
 3 |>     fn foo(x: u32) {
   |>     -
 "#[1..]);