Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2064:547ede0123a2
util.unlink should only catch OSError.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 13 Apr 2006 13:46:56 -0700 |
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)