diff tests/test-merge8.out @ 4014:509342f95564

various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 29 Dec 2006 06:37:43 +0100
parents 9103dab96093
children 4787e2b0dd03
line wrap: on
line diff