view tests/test-merge5.out @ 5753:ea1016b32e94

patchbomb: make --bundle respect --desc
author Patrick Mezard <pmezard@gmail.com>
date Thu, 27 Dec 2007 22:40:07 -0600
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