view doc/hgmerge.1.txt @ 586:11578820b5d7

[PATCH] Tags template cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Tags template cleanup From: Edouard Gomez <edouard.gomez@gmail.com> Tags template cleanup This page lists all tags, thus using divs doesn't structure well the information. Better use a list (ul). Each tag becomes a li element. The li element also carries the parity information. As font style tags are highly deprecated in newer HTML variants get rid of the tt element, relaced by a simple span that gets a CSS class that mimics tt default style (monospaced text) Added CSS classes required to match old style. manifest hash: f8943b8270e20966a04111e7205deefedd8b7075 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx1ijywK+sNU5EO8RAjaAAJoCVaD37YUC6DueL6Kd5D9aoCF8bQCfSWw0 xFVkpEtnr6ST4eyJjR8K17U= =nphb -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 19:16:51 -0800
parents c084cfbb2389
children 3ab6e55ee361
line wrap: on
line source

HGMERGE(1)
==========
Matt Mackall <mpm@selenic.com>
v0.1, 27 May 2005

NAME
----
hgmerge - default wrapper to merge files in Mercurial SCM system

SYNOPSIS
--------
'hgmerge' local ancestor remote

DESCRIPTION
-----------
The hgmerge(1) command provides a graphical interface to merge files in the
Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),
or simply diff(1) and patch(1) depending on what is present on the system.

hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is
not set.

AUTHOR
------
Written by Vincent Danjean <Vincent.Danjean@free.fr>

SEE ALSO
--------
hg(1) - the command line interface to Mercurial SCM

COPYING
-------
Copyright (C) 2005 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License (GPL).