view tests/test-merge5.out @ 5350:1df76921aab3

set_exec: do not chmod a symlink
author Steve Borho <steve@ageia.com>
date Tue, 02 Oct 2007 20:22:33 +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