annotate templates/header-raw.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 f918a6fa2572
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
diff changeset
1 Content-type: text/plain