view mercurial/templates/raw/changelog.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.

{header}
# HG changelog
# Node ID {node}

{entries%changelogentry}