Mercurial > hg > mercurial-crew-with-dirclash
diff templates/filerevision.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 | 19d2776f1725 |
children | ba625c8083d8 |