Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/hg.1.txt @ 3100:09e8aecd8016
Merge with backout
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 15 Sep 2006 16:01:16 -0500 |
parents | b9dbbcf8a488 |
children | c9cd63a6fce9 |
comparison
equal
deleted
inserted
replaced
3099:c27d1e1798a3 | 3100:09e8aecd8016 |
---|---|
191 This file contains defaults and configuration. Values in .hg/hgrc | 191 This file contains defaults and configuration. Values in .hg/hgrc |
192 override those in $HOME/.hgrc, and these override settings made in the | 192 override those in $HOME/.hgrc, and these override settings made in the |
193 global /etc/mercurial/hgrc configuration. See hgrc(5) for details of | 193 global /etc/mercurial/hgrc configuration. See hgrc(5) for details of |
194 the contents and format of these files. | 194 the contents and format of these files. |
195 | 195 |
196 Some commands (e.g. revert) produce backup files ending in .orig, if | |
197 the .orig file already exists and is not tracked by Mercurial, it | |
198 will be overwritten. | |
199 | |
196 BUGS | 200 BUGS |
197 ---- | 201 ---- |
198 Probably lots, please post them to the mailing list (See Resources below) | 202 Probably lots, please post them to the mailing list (See Resources below) |
199 when you find them. | 203 when you find them. |
200 | 204 |