Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 1722:681c5c211b92
catch errors and throw exception with invalid binary patch data
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 15 Feb 2006 04:37:47 +0100 |
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)