Mercurial > hg

view tests/test-merge5.out @ 2726:6bd351194a96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add test mq keeping a reference to localrepo which can't remove journal on exit.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Jul 2006 08:59:06 +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)