view tests/test-merge5.out @ 4882:25d753efd48e

test-symlink-basic: require symlinks availability
author Patrick Mezard <pmezard@gmail.com>
date Sun, 15 Jul 2007 14:09:56 +0200
parents fffc8a733bf9
children
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