diff tests/test-merge1.out @ 3293:a225055b3b59

bundle --base: use the right set for the base
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 09 Oct 2006 15:44:20 +0200
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff