Mercurial > hg
view mercurial/templates/coal/map @ 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 | c450265b5611 |
children | 5f86818c95e5 |
line wrap: on
line source
%include paper/map footer = ../paper/footer.tmpl search = ../paper/search.tmpl changelog = ../paper/shortlog.tmpl shortlog = ../paper/shortlog.tmpl shortlogentry = ../paper/shortlogentry.tmpl graph = ../paper/graph.tmpl help = ../paper/help.tmpl helptopics = ../paper/helptopics.tmpl diffstatlink = ../paper/diffstat.tmpl diffstatnolink = ../paper/diffstat.tmpl changelogentry = ../paper/shortlogentry.tmpl searchentry = ../paper/shortlogentry.tmpl changeset = ../paper/changeset.tmpl manifest = ../paper/manifest.tmpl filerevision = ../paper/filerevision.tmpl fileannotate = ../paper/fileannotate.tmpl filediff = ../paper/filediff.tmpl filecomparison = ../paper/filecomparison.tmpl filelog = ../paper/filelog.tmpl filelogentry = ../paper/filelogentry.tmpl tags = ../paper/tags.tmpl bookmarks = ../paper/bookmarks.tmpl branches = ../paper/branches.tmpl index = ../paper/index.tmpl notfound = ../paper/notfound.tmpl error = ../paper/error.tmpl