Mercurial > hg > pyhgsh
view tests/test-merge5.out @ 1527:c13fce7167c2
don't print anything about file of unsupported type unless
the file was specified on the command line
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 11 Nov 2005 15:33:08 -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)