view templates/atom/tags.tmpl @ 6206:0b6f12495276

fetch: switch the default parent used for a merge

This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.

The prior default behaviour is still available, via the --switch-parent
option.

#header#
 <id>{urlbase}{url}</id>
 <link rel="self" href="{urlbase}{url}atom-tags"/>
 <link rel="alternate" href="{urlbase}{url}tags"/>
 <title>#repo|escape#: tags</title>
 <summary>#repo|escape# tag history</summary>
 <author><name>Mercurial SCM</name></author>
 #latestentry%feedupdated#

#entriesnotip%tagentry#
</feed>