view tests/test-merge5.out @ 5083:73169e5d2732

posixfile_nt: '+' was understood as read mode instead of update.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 17 Jul 2007 23:33:42 +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