changeset 3252 | ae85272b59a4 |
parent 3251 | c93ce7f10f85 |
child 3292 | 764688cf51e5 |
--- a/tests/test-rename-merge1.out Wed Oct 04 19:08:04 2006 -0500 +++ b/tests/test-rename-merge1.out Fri Oct 06 16:55:11 2006 -0500 @@ -6,6 +6,7 @@ ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c a: remote moved -> c b2: remote created -> g +merging a and b to b resolving a my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c copying a to b