| changeset 6228 | c0c4c7b1e8d3 |
| parent 6213 | 5c5e45766224 |
| child 6336 | 4b0c9c674707 |
--- a/tests/test-imerge.out Tue Mar 11 17:42:26 2008 -0500 +++ b/tests/test-imerge.out Tue Mar 11 17:42:29 2008 -0500 @@ -47,4 +47,4 @@ % nothing to merge abort: there is nothing to merge - use "hg update" instead % load unknown parent -abort: merge parent e6da4671640124fe5d3d70d2f54441d6cd76ae35 not in repository +abort: merge parent e6da46716401 not in repository