view tests/test-merge5.out @ 4755:47091c8d028e

convert: move *** empty log message *** into commit class
author Brendan Cully <brendan@kublai.com>
date Sun, 01 Jul 2007 19:40:02 -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