view tests/test-merge5.out @ 5320:189d82b6962e

bisect: don't write data on failure
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 22 Sep 2007 18:35:53 +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