view tests/test-merge5.out @ 5323:46455285c6b5

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Sep 2007 15:29:58 +0200
parents fffc8a733bf9
children 4b0c9c674707
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