Mercurial > hg

view mercurial/help/hgignore.5.txt @ 21707:e22cfd1ae97c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: suppress keyword expansion while 'hg histedit' for internal merge Before this patch, 'hg histedit' may cause unexpected conflict, if 'hg histedit'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg histedit' for internal merge by adding 'histedit' to 'restricted' command list like 'merge'. Test in this patch just swaps order of revision #13 and #14: this is enough to cause internal merge.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 05 Jun 2014 16:47:14 +0900
parents 9c963a43ecfb
children 8fe5fc8d7b8e
line wrap: on
line source

==========
 hgignore
==========

---------------------------------
syntax for Mercurial ignore files
---------------------------------

:Author:         Vadim Gelfer <vadim.gelfer@gmail.com>
:Organization:   Mercurial
:Manual section: 5
:Manual group:   Mercurial Manual

.. include:: hgignore.5.gendoc.txt

Author
======
Vadim Gelfer <vadim.gelfer@gmail.com>

Mercurial was written by Matt Mackall <mpm@selenic.com>.

See Also
========
|hg(1)|_, |hgrc(5)|_

Copying
=======
This manual page is copyright 2006 Vadim Gelfer.
Mercurial is copyright 2005-2014 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.

.. include:: common.txt