view tests/test-merge5.out @ 4047:705d0792dbf2

add pserver support to convert_repo
author csaba.henk@creo.hu
date Sat, 27 Jan 2007 15:53:31 -0800
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