view mercurial/templates/raw/logentry.tmpl @ 26572:c7850af6bb75

filemerge._merge: drop no longer necessary 'if r:' check

Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.

changeset:   {node}
revision:    {rev}
user:        {author}
date:        {date|rfc822date}
summary:     {desc}
{branches%branchname}{tags%tagname}{bookmarks%bookmarkname}