view tests/test-merge5.out @ 6289:91ac1726730a

issue 1003: send all data properly
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 16 Mar 2008 22:59:04 -0700
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