diff contrib/mercurial.spec @ 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 ab22af71386f
children d4545f1b8bfa
line wrap: on
line diff