view tests/test-simplemerge-cmd.out @ 7421:4c4324476be6

Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 26 Nov 2008 18:23:35 +0100
parents ea7b982b6c08
children e1f4343db740
line wrap: on
line source

(binary:application/octet-stream)