Mercurial > hg
view mercurial/helptext/hgrc.5.txt @ 48710:b0aa9b0b9c21
convert: use the merge action constant
The constant exists, lets use them. Otherwise we cannot make these constant more
powerful.
Differential Revision: https://phab.mercurial-scm.org/D12113
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 28 Jan 2022 16:25:41 +0100 |
parents | d4ba4d51f85f |
children | a1538c05d855 |
line wrap: on
line source
====== hgrc ====== --------------------------------- configuration files for Mercurial --------------------------------- :Author: Bryan O'Sullivan <bos@serpentine.com> :Organization: Mercurial :Manual section: 5 :Manual group: Mercurial Manual .. contents:: :backlinks: top :class: htmlonly Description =========== .. include:: hgrc.5.gendoc.txt Author ====== Bryan O'Sullivan <bos@serpentine.com>. Mercurial was written by Olivia Mackall <olivia@selenic.com>. See Also ======== |hg(1)|_, |hgignore(5)|_ Copying ======= This manual page is copyright 2005 Bryan O'Sullivan. Mercurial is copyright 2005-2021 Olivia 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