view tests/test-merge5.out @ 4075:31a679ae7eef

Fix dirstate fail at drive root on Windows
author Andrei Vermel <avermel@mail.ru>
date Fri, 09 Feb 2007 20:50:41 +0300
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