---

brson · brson · commit 793eff9de799 · 2012-09-26T18:41:02.000-07:00
yaml --- r: 22097 b: refs/heads/snap-stage3 c: 87a7256 h: refs/heads/master i: 22095: 0afd714 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3232e7599566e896c9bfee4e4eba71e6963e3ce8
+refs/heads/snap-stage3: 87a72567f05cdae035007e761f7bd08f049af216
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/test/run-pass/issue-2904.rs b/branches/snap-stage3/src/test/run-pass/issue-2904.rs
@@ -52,13 +52,8 @@ fn read_board_grid<rdr: Owned io::Reader>(+in: rdr) -> ~[~[square]] {
     let mut grid = ~[];
     for in.each_line |line| {
         let mut row = ~[];
-<<<<<<< HEAD
         for str::each_char(line) |c| {
-            vec::push(row, square_from_char(c))
-=======
-        for line.each_char |c| {
             row.push(square_from_char(c))
->>>>>>> Demode vec::push (and convert to method)
         }
         grid.push(row)
     }

Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,8 @@ fn read_board_grid<rdr: Owned io::Reader>(+in: rdr) -> ~[~[square]] {`
`52`	`52`	`let mut grid = ~[];`
`53`	`53`	`for in.each_line \|line\| {`
`54`	`54`	`let mut row = ~[];`
`55`		`-<<<<<<< HEAD`
`56`	`55`	`for str::each_char(line) \|c\| {`
`57`		`- vec::push(row, square_from_char(c))`
`58`		`-=======`
`59`		`- for line.each_char \|c\| {`
`60`	`56`	`row.push(square_from_char(c))`
`61`		`->>>>>>> Demode vec::push (and convert to method)`
`62`	`57`	`}`
`63`	`58`	`grid.push(row)`
`64`	`59`	`}`