diff tests/test-merge5 @ 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 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff