diff tests/test-merge-local @ 6520:ba0b2dacc623

fix import with -p0
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 12 Apr 2008 22:41:07 -0400
parents 46280c004f22
children 4c94b6d0fb1c
line wrap: on
line diff