Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2125:3610d9468b1e
Use string literal concatenation for optlist and import -p option
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 25 Apr 2006 09:00:09 +0200 |
parents | 5c4496ed152d |
children | b2ae81a7df29 |
line wrap: on
line source
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)