changeset 3121 | 2ef0b3aae186 |
parent 3110 | 40e777bda455 |
child 3211 | 3fd098e0902d |
--- a/tests/test-merge7.out Sun Sep 17 21:11:26 2006 -0500 +++ b/tests/test-merge7.out Sun Sep 17 21:27:30 2006 -0500 @@ -24,7 +24,7 @@ resolving manifests overwrite None branchmerge True partial False ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 - test.txt versions differ, resolve + test.txt: versions differ -> m merging test.txt resolving test.txt file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557