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

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

copies: detect files as `touched/salvaged` if they only existed on one side...
copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219
Matt Harbison - - Load All Authors

File last commit:

r47142:ed43b6fa stable
r47570:c52c3c4c default
Show More
hgrc.5.txt
41 lines | 788 B | text/plain | TextLexer
/ mercurial / helptext / hgrc.5.txt
History | Source | Raw |Copy content |Copy permalink
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 2021...
 r47142 Mercurial is copyright 2005-2021 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