Mercurial > hg

view mercurial/templates/coal/header.tmpl @ 22841:18b3869179f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make error message consistent with other commands If a merge is attempted when another merge is already ongoing, we give the message "outstanding uncommitted merges". Many other commands (such as backout, rebase, histedit) give the same message in singular form. Since the singular form also seems to make more sense, let's use that for 'hg merge' as well.
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 14:16:53 -0700
parents 9409aeaafdc1
children c258f4d2bfb2
line wrap: on
line source

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<link rel="icon" href="{staticurl|urlescape}hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="{staticurl|urlescape}style-coal.css" type="text/css" />
<script type="text/javascript" src="{staticurl|urlescape}mercurial.js"></script>