view mercurial/templates/raw/manifest.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.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 08 Oct 2015 14:16:19 -0700
parents f91e5630ce7e
children
line wrap: on
line source

{header}
{dentries%direntry}{fentries%fileentry}
{footer}