view tests/test-merge5.out @ 5033:1b07668b8cc3

patch: remove unused parameter from b85diff
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 30 Jul 2007 20:49:08 -0700
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