view tests/test-merge2.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 5a034646e472
children b2ae81a7df29
line wrap: on
line source

adding b
adding b