Mercurial > hg
view tests/test-merge5.out @ 2701:f12d2e5b97fe
Merged backout head.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 27 Jul 2006 18:53:31 +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)