##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

diff: replace --merge option by config option...
diff: replace --merge option by config option I can't think of any reason you'd want to enable the merge diff on a run-to-run basis; you'd probably either always or never want it set (though I can't see why you'd never want it set). If you have it set, you'll probably also want the same output in `hg log -p` output. Having a single config option for the feature makes sense. Differential Revision: https://phab.mercurial-scm.org/D9956
Matt Harbison - - Load All Authors

File last commit:

r47142:ed43b6fa stable
r47224:6bb80672 default
Show More
hgignore.5.txt
34 lines | 716 B | text/plain | TextLexer
/ mercurial / helptext / hgignore.5.txt
History | Annotation | Raw |Copy content |Copy permalink
==========
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