# HG changeset patch # User Martin Geisler # Date 1242455603 -7200 # Node ID c1ad221a0e976d9f3f3cb01721839e8c2b0e55aa # Parent dbfe321643ce1bd3410adbd9f1630fe5ad926da2 contrib/win32: indent and word wrap consistently diff -r dbfe321643ce -r c1ad221a0e97 contrib/win32/ReadMe.html --- a/contrib/win32/ReadMe.html Sat May 16 08:26:36 2009 +0200 +++ b/contrib/win32/ReadMe.html Sat May 16 08:33:23 2009 +0200 @@ -18,94 +18,130 @@

Welcome to Mercurial for Windows!

Mercurial is a command-line application. You must run it from +

+ Mercurial is a command-line application. You must run it from the Windows command prompt (or if you're hard core, a MinGW shell).

+ href="http://www.mingw.org/">MinGW shell). +

Note: the standard MinGW msys startup script uses - rxvt which has problems setting up standard input and output. - Running bash directly works correctly.

+ Note: the standard MinGW + msys startup script uses rxvt which has problems setting up + standard input and output. Running bash directly works + correctly. +

For documentation, please visit the + For documentation, please visit the Mercurial web site. You can also download a free book, Distributed revision control - with Mercurial.

+ with Mercurial. +

By default, Mercurial installs to C:\Program Files\Mercurial. The - Mercurial command is called hg.exe.

+ By default, Mercurial installs to C:\Program + Files\Mercurial. The Mercurial command is called + hg.exe. +

Testing Mercurial after you've installed it

The easiest way to check that Mercurial is installed properly is to - just type the following at the command prompt:

+ The easiest way to check that Mercurial is installed properly is + to just type the following at the command prompt: +

hg

This command should print a useful help message. If it does, - other Mercurial commands should work fine for you.

+ This command should print a useful help message. If it does, + other Mercurial commands should work fine for you. +

Configuration notes

Default editor

The default editor for commit messages is 'notepad'. You can set the EDITOR - (or HGEDITOR) environment variable to specify your preference or set it in - mercurial.ini:

Default editor

+ The default editor for commit messages is 'notepad'. You can set + the EDITOR (or HGEDITOR) environment variable to specify your + preference or set it in mercurial.ini: +

 [ui]
 editor = whatever

Configuring a Merge program

It should be emphasized that Mercurial by itself doesn't attempt to do a - Merge at the file level, neither does it make any attempt to Resolve the conflicts.

Configuring a Merge program

+ It should be emphasized that Mercurial by itself doesn't attempt + to do a Merge at the file level, neither does it make any + attempt to Resolve the conflicts. +

By default, Mercurial will use the merge program defined by the HGMERGE environment - variable, or uses the one defined in the mercurial.ini file. (see MergeProgram on the Mercurial Wiki for more information)

+ By default, Mercurial will use the merge program defined by the + HGMERGE environment variable, or uses the one defined in the + mercurial.ini file. (see MergeProgram + on the Mercurial Wiki for more information) +

Reporting problems

Before you report any problems, please consult the Mercurial web site and - see if your question is already in our list of Frequently - Answered Questions (the "FAQ").

+ Before you report any problems, please consult the Mercurial web site + and see if your question is already in our list of Frequently + Answered Questions (the "FAQ"). +

If you cannot find an answer to your question, please feel - free to send mail to the Mercurial mailing list, at mercurial@selenic.com. +

+ If you cannot find an answer to your question, please feel free + to send mail to the Mercurial mailing list, at mercurial@selenic.com. Remember, the more useful information you include in your - report, the easier it will be for us to help you!

+ report, the easier it will be for us to help you! +

If you are IRC-savvy, that's usually the fastest way to get - help. Go to #mercurial on - irc.freenode.net.

+ If you are IRC-savvy, that's usually the fastest way to get + help. Go to #mercurial on irc.freenode.net. +

Author and copyright information

Mercurial was written by Matt - Mackall, and is maintained by Matt and a team of - volunteers.

+ Mercurial was written by Matt + Mackall, and is maintained by Matt and a team of volunteers. +

The Windows installer was written by Bryan - O'Sullivan.

+ The Windows installer was written by Bryan O'Sullivan. +

Mercurial is free software; you can redistribute it and/or +

+ Mercurial is free software; you can redistribute it and/or modify it under the terms of the GNU + href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU General Public License version 2 as published by the Free - Software Foundation.

+ Software Foundation. +

Mercurial is distributed in the hope that it will be useful, - but without any warranty; without even the implied - warranty of merchantability or fitness for a - particular purpose. See the GNU General Public License for - more details.

+ Mercurial is distributed in the hope that it will be useful, but + without any warranty; without even the implied warranty + of merchantability or fitness for a particular + purpose. See the GNU General Public License for more + details. +