Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 1519:5b19dea9d4fd
Merge with TAH
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 09 Nov 2005 12:52:05 -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)