##// END OF EJS Templates
merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816

File last commit:

r26284:c258f4d2 default
r45835:0c849f01 default
Show More
style-extra-coal.css
46 lines | 608 B | text/css | CssLexer
body {
background: black url('background.png') repeat-x;
}
.container {
padding-left: 0;
padding-right: 150px;
}
.main {
padding: 2em;
border-right: 15px solid black;
border-bottom: 15px solid black;
}
.menu {
background: #999;
padding: 10px;
width: 75px;
position: fixed;
top: 27px;
left: auto;
right: 27px;
}
.menu ul {
border-left: 0;
}
.menu li.active {
font-weight: normal;
background: black;
color: white;
}
.menu li.active a {
color: white;
}
h3 {
margin-top: -.7em;
}
div.description {
border-left-width: 3px;
}