Mercurial > hg
view mercurial/templates/atom/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 | d70703954a2a |
children | 82858f144217 |
line wrap: on
line source
default = 'changelog' feedupdated = '<updated>{date|rfc3339date}</updated>' mimetype = 'application/atom+xml; charset={encoding}' header = header.tmpl changelog = changelog.tmpl changelogentry = changelogentry.tmpl filelog = filelog.tmpl filelogentry = filelogentry.tmpl tags = tags.tmpl tagentry = tagentry.tmpl bookmarks = bookmarks.tmpl bookmarkentry = bookmarkentry.tmpl branches = branches.tmpl branchentry = branchentry.tmpl error = error.tmpl filedifflink = '{file|escape}<br />' fileellipses = '{file|escape}<br />' filenodelink = '{file|escape}<br />' filenolink = '{file|escape}<br />'