| changeset 5863 | 3d1f9dcecdea |
| parent 5670 | 840e2b315c1f |
| child 6336 | 4b0c9c674707 |
--- a/tests/test-merge1.out Tue Jan 15 15:49:24 2008 -0600 +++ b/tests/test-merge1.out Wed Jan 16 11:14:24 2008 -0600 @@ -34,7 +34,7 @@ diff -r c1dd73cbf59f b --- a/b +++ b/b -@@ -1,1 +1,1 @@ This is file b1 +@@ -1,1 +1,1 @@ -This is file b1 +This is file b22 M b @@ -49,7 +49,7 @@ diff -r c1dd73cbf59f b --- a/b +++ b/b -@@ -1,1 +1,1 @@ This is file b1 +@@ -1,1 +1,1 @@ -This is file b1 +This is file b33 M b