Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2498:1e2ec4fd16df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 26 Jun 2006 14:49:18 +0200
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)