diff tests/test-unrelated-pull.out @ 1571:bcdc030c59f8

add a --switch-parent option to export against the other parent
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 21:01:57 -0600
parents 9344f5dd4488
children 7544700fd931
line wrap: on
line diff