view mercurial/helptext/hgignore.5.txt @ 46497:4a012e531066

diff: extract function for getting possibly re-merged parent to diff against We'll want to reuse the logic that `hg diff --change` with `diff.merge` uses. At least `hg log -p` should reuse it. This patch therefore extracts that code to a function. Differential Revision: https://phab.mercurial-scm.org/D9957
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 04 Feb 2021 13:21:01 -0800
parents ed43b6fa847e
children d4ba4d51f85f
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-2021 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