##// END OF EJS Templates
merge: branch code into {n1 and n2, n1, n2} top-level cases...
merge: branch code into {n1 and n2, n1, n2} top-level cases There are three high-level cases that are of interest in manifestmerge(): 1) The file exists on both sides, 2) The file exists only on the local side, and 3) The file exists only on the remote side. Let's make this clearer in the code. The 'if f in copied' case will be broken up into the two applicable branches in the next patch.

File last commit:

r18526:9409aeaa stable
r23473:922b10c8 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>