Mercurial > hg
view mercurial/templates/atom/error.tmpl @ 35324:72fbdd373de8
overlayworkingctx: add _auditconflicts to write()
Alas, part of Mercurial's conflict detection (for file<->folder conflicts,
for example) depends on the filesystem. We don't have the filesystem with IMM,
so we have to run these checks ourselves.
Differential Revision: https://phab.mercurial-scm.org/D1241
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Thu, 07 Dec 2017 16:07:06 -0800 |
parents | 4b0fc75f9403 |
children |
line wrap: on
line source
{header} <!-- Error --> <id>{urlbase}{url|urlescape}</id> <link rel="self" href="{urlbase}{url|urlescape}atom-log"/> <link rel="alternate" href="{urlbase}{url|urlescape}"/> <title>Error</title> <updated>1970-01-01T00:00:00+00:00</updated> <entry> <title>Error</title> <id>https://mercurial-scm.org/#error</id> <author> <name>mercurial</name> </author> <updated>1970-01-01T00:00:00+00:00</updated> <content type="text">{error|escape}</content> </entry> </feed>