view tests/test-merge5.out @ 4846:40007fe82be9

Last change broke new-style URLs
author Brendan Cully <brendan@kublai.com>
date Fri, 06 Jul 2007 10:11:48 -0700
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes