---

yaml
---
r: 277943
b: refs/heads/auto
c: 790043b
h: refs/heads/master
i:
  277941: a95c0f3
  277939: 4ea668e
  277935: 0b155bd

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 8a9ad72c1d67261049aac1d067529da48adcc644
+refs/heads/auto: 790043b44e0c078c0f80b16cd03d1aeac6ef242b
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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..]);

branches/auto/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..]);