diff templates/manifest.tmpl @ 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 78590fb4a82b
children f2ebd5251e88
line wrap: on
line diff