Mercurial > hg > pyhgsh
view tests/test-merge5.out @ 2265:3e4a1a0739c2
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 11 May 2006 09:44:11 -0700 |
parents | b2ae81a7df29 |
children |
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)