##// END OF EJS Templates
tests: make merge conflicts explicit in `hg annotate` tests...
tests: make merge conflicts explicit in `hg annotate` tests We were using `true` as merge tool. I think it makes the test easier to understand if we make the conflicts explcit. It also papered over a conflict that shouldn't have been a conflict (just a bug in copy tracing). I've marked that "BROKEN". Differential Revision: https://phab.mercurial-scm.org/D6252

File last commit:

r19767:d4501068 default
r42327:7116fc61 default
Show More
search.tmpl
7 lines | 111 B | application/x-cheetah | CheetahLexer
Alexander Plavin
hgweb: add changelog and search templates to raw style...
r19429 {header}
# HG changesets search
# Node ID {node}
# Query "{query}"
Alexander Plavin
raw: show current search mode name at search results
r19767 # Mode {modedesc}
Alexander Plavin
hgweb: add changelog and search templates to raw style...
r19429
{entries%changelogentry}