##// END OF EJS Templates
tests: test divergence created during interrupted rebase...
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

File last commit:

r20255:b1d65cb8 default
r47586:6648307d default
Show More
header.tmpl
7 lines | 389 B | application/x-cheetah | CheetahLexer
Takumi IINO
hgweb: infinite scroll support for monoblue style
r20255 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <html>
<head>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="icon" href="{staticurl|urlescape}hgicon.png" type="image/png">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <meta name="robots" content="index, nofollow" />
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="stylesheet" href="{staticurl|urlescape}style.css" type="text/css" />
<script type="text/javascript" src="{staticurl|urlescape}mercurial.js"></script>