view tests/test-merge5.out @ 5116:35d47b06d4e3

patch: add git symlink support
author Brendan Cully <brendan@kublai.com>
date Sat, 04 Aug 2007 23:07:52 -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