Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 948:ffb0665028f0
Merge with BOS
author | mpm@selenic.com |
---|---|
date | Fri, 19 Aug 2005 16:43:30 -0800 |
parents | 5a034646e472 |
children | ced2d3620f95 |
line wrap: on
line source
removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to merge across branches or -C to lose changes)