Mercurial > hg > pyhgsh
view tests/test-merge-revert.out @ 1956:16750010813d
use a proper test instead of catching every exception
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 15 Mar 2006 07:09:42 +0100 |
parents | 7544700fd931 |
children | d436b21b20dc |
line wrap: on
line source
1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip eb43f19ff115 eb43f19ff115+ eb43f19ff115 016807e6fdaf tip merging file1 016807e6fdaf tip 016807e6fdaf tip 016807e6fdaf tip 016807e6fdaf tip