##// END OF EJS Templates
tests: add `hg log -G` output when there are merge conflicts...
tests: add `hg log -G` output when there are merge conflicts The next commit will change the behavior for these. I've used slightly different commands in the different tests to match the surrounding style. Differential Revision: https://phab.mercurial-scm.org/D8042

File last commit:

r44631:0ab651b5 stable
r44818:ab632e27 default
Show More
hgrc.5.txt
41 lines | 788 B | text/plain | TextLexer
Matt Harbison
help: create packages for the help text...
r44031 ======
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.
Matt Harbison
copyright: update to 2020...
r44631 Mercurial is copyright 2005-2020 Matt Mackall.
Matt Harbison
help: create packages for the help text...
r44031 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