##// END OF EJS Templates
import: show the warning message for failure of merging...
import: show the warning message for failure of merging Before this patch, no message is shown for failure of merging at "hg import". In such case, merging patch is imported as a normal revision silently, and it may confuse users. For simplicity, this patch recommends just using "--exact", even though importing the merging patch itself is possible without it if: - the hash of the 1st parent in the patch is equal to one of the patch imported just before (or the parent of the working directory, for the 1st patch of the series), and - the hash of the 2nd parent in the patch is known in the local repository

File last commit:

r20227:9c963a43 default
r22303:0c838e74 stable
Show More
hgignore.5.txt
34 lines | 716 B | text/plain | TextLexer
==========
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-2014 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