Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2827:56f99f5aab34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
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)