Mercurial > hg
view tests/test-merge5.out @ 8601:021de2d12355
inotify: adding test for issue1556
author | Dmitriy Kostunin <dmitriy.kostunin@gmail.com> |
---|---|
date | Tue, 31 Mar 2009 00:04:07 +0900 |
parents | 0b89315d5de2 |
children | 68a1b9d0663e |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b created new head % should abort abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) % should succeed abort: crosses branches (use 'hg merge' or 'hg update -C')