##// END OF EJS Templates
merge: use constants for merge state record types...
merge: use constants for merge state record types merge.py is using multiple discrete sets of 1 and 2 letter constants to define types and behavior. To the uninitiated, the code is very difficult to reason about. I didn't even realize there were multiple sets of constants in play initially! We begin our sanity injection with merge state records. The record types (which are serialized to disk) are now defined in RECORD_* constants. Differential Revision: https://phab.mercurial-scm.org/D2698

File last commit:

r35792:854a7315 default
r37127:a532b2f5 default
Show More
hgrc.5.txt
41 lines | 788 B | text/plain | TextLexer
Takumi IINO
doc: make man and html from translated documents...
r19426 ======
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 Matt Mackall <mpm@selenic.com>.
See Also
========
|hg(1)|_, |hgignore(5)|_
Copying
=======
This manual page is copyright 2005 Bryan O'Sullivan.
av6
copyright: update to 2018...
r35792 Mercurial is copyright 2005-2018 Matt Mackall.
Takumi IINO
doc: make man and html from translated documents...
r19426 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