Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2778:2e0cd25fe4ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make log --follow revision range start default to working dir parent.
author Brendan Cully <brendan@kublai.com>
date Thu, 03 Aug 2006 13:29:31 -0700
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)