templates/raw/header.tmpl
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 3782 713e35dcc321
permissions -rw-r--r--
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3782
713e35dcc321 hgweb: report detected character set
Matt Mackall <mpm@selenic.com>
parents: 3228
diff changeset
     1
Content-type: text/plain; charset={encoding}
713e35dcc321 hgweb: report detected character set
Matt Mackall <mpm@selenic.com>
parents: 3228
diff changeset
     2