Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2478:287b7da4aeaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in localrepo.changes. caused by 1e32e2fe8a677c391049d40b8794478976a0a914.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 21 Jun 2006 16:20:21 -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)