##// END OF EJS Templates
tests: add test of rebase with conflict in merge commit...
tests: add test of rebase with conflict in merge commit It doesn't seem like we had any tests of this. I think it's pretty weird that the two parents we're merging are not the working copy parents during the conflict resolution. Differential Revision: https://phab.mercurial-scm.org/D7824

File last commit:

r18526:9409aeaa stable
r44816:7f7c8521 default
Show More
header.tmpl
5 lines | 149 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <?xml version="1.0" encoding="{encoding}"?>
<rss version="2.0">
<channel>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link>{urlbase}{url|urlescape}</link>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <language>en-us</language>