diff tests/test-help.out @ 1581:db10b7114de0

abort when merging two heads and repository has local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 22:19:03 -0600
parents 1d7d0c07e8f3
children 6c61646fee5e
line wrap: on
line diff