Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2571:d22d730c96ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: record few more daemon pids to be safe
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 06 Jul 2006 11:49:19 -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)