Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 1122:fb008a1a0a32
Use .has_option to avoid the unknown Exception.
author | Ollivier Robert <roberto@keltia.freenix.fr> |
---|---|
date | Sat, 27 Aug 2005 23:44:02 -0700 |
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)