view tests/test-merge5.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 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)