|
Size: 1457
Comment: document the horrible truth about hgmerge
|
Size: 469
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| = Manpages = Best use `hg help` (or `man hg` on unix) of your locally installed Mercurial for up-to-date help information covering the version you have installed (see [:WhatsNew] for version information). The man pages hg(1) and hgrc(5) are also available in html-format in the [http://www.selenic.com/mercurial/release/?M=D release tarballs] as {{{doc/hg.1.html}}} and {{{doc/hgrc.5.html}}}. Original links to online-versions of the manpages (as of 2008-05-02 rather historic): || man page || URL || Last updated || || hg(1) || http://www.selenic.com/mercurial/hg.1.html || 12-Dec-2006 17:00:20 CDT || || hgmerge(1) || http://www.selenic.com/mercurial/hgmerge.1.html || v0.1, 27 May 2005 || || hgignore(5) || http://www.selenic.com/mercurial/hgignore.5.html || 12-Dec-2006 17:00:22 CDT || || hgrc(5) || http://www.selenic.com/mercurial/hgrc.5.html || 12-Dec-2006 17:00:23 CDT || Notes: * As of Mercurial 1.0, hgmerge is no longer installed by default; but if it's installed, hg will use it (see [:MergeToolConfiguration]) Newer versions of some man pages may be available on other sites (may be temporary): || man page || URL || Last updated || || hg(1) || http://www.cadifra.com/mercurial/hg.1.html || 23-Apr-2008 16:48:02 CEST || || hgrc(5) || http://www.cadifra.com/mercurial/hgrc.5.html || 14-May-2008 11:17:48 CEST || See also: [:TranslatedManPages], [:FAQ], [:TipsAndTricks], [:UnderstandingMercurial] |
The writer is known as Ruth and her husband does not like that at all. To perform with puppies is the thing that she does weekly. She's always loved living in Missouri but her husband wants them all to move. http://i301.photobucket.com/albums/nn54/cheetara13778/2008%20Birthdays/DSC00033.jpg Credit authorising continues to be her day-job for a while. She is not good at design but you may want to check on her website: http://www.youtube.com/watch?v=IHkcnRMVdxc |
The writer is known as Ruth and her husband does not like that at all. To perform with puppies is the thing that she does weekly. She's always loved living in Missouri but her husband wants them all to move. http://i301.photobucket.com/albums/nn54/cheetara13778/2008%20Birthdays/DSC00033.jpg Credit authorising continues to be her day-job for a while. She is not good at design but you may want to check on her website: http://www.youtube.com/watch?v=IHkcnRMVdxc
