Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4210:6cb5be6bd70f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: add qparent tag (first parent of qbase)
author Brendan Cully <brendan@kublai.com>
date Wed, 14 Mar 2007 10:45:18 -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