view mercurial/help/hgignore.5.txt @ 42953:085295f82845 stable

merge: respect parents order when using `graft` on a merge, this time for real See a4ca0610c754. potherp1 is a boolean variable that means "pother is ctx.p1", and parents is naturally [ctx.p1, ctx.p2]. pctx is always removed from parents, so if pctx is parents[0], then we end up using parents[1] as pother. To be true to its name, potherp1 should then be True only when pctx is at parents[1].
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 18 Sep 2019 17:53:10 +0700
parents 8427fea04017
children
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-2019 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