diff tests/test-diffdir @ 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 4f81068ed8cd
children fde8fb2cbede
line wrap: on
line diff