diff tests/test-merge1.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 67a28636ea64
children db10b7114de0
line wrap: on
line diff