view mercurial/templates/static/style-extra-coal.css @ 32255:7e35d31b41fd

filemerge: add internal merge tool to dump files forcibly

Internal merge tool :dump implies premerge. Therefore, files aren't
dumped, if premerge runs successfully.

This undocumented behavior might confuse users, if they want to always
dump files. But just making :dump omit premerge might cause backward
compatibility issue for existing automation.

This patch adds new internal merge tool :forcedump, which works as
same as :dump, but omits premerge always.

Internal tools annotated with "nomerge" should merge "change and
delete" correctly, but _forcedump() can't. Therefore, it is annotated
with "mergeonly" to always omit premerge, even though it doesn't merge
files actually.

This patch also adds explanation about premerge to :dump, to clarify
how :dump actually works.

BTW, this patch specifies internal tools with "internal:" prefix in
newly added test scenario in test-merge-tools.t, even though this
prefix is already deprecated. This is only for similarity to other
tests in test-merge-tools.t.

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;
}