--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Mercurial for Windows</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
<style type="text/css">
<!--
.indented
@@ -21,7 +21,7 @@
<p>Mercurial is a command-line application. You must run it from
the Windows command prompt (or if you're hard core, a <a
href="http://www.mingw.org/">MinGW</a> shell).</p>
-
+
<p><div class="indented"><i>Note: the standard <a
href="http://www.mingw.org/">MinGW</a> msys startup script uses
rxvt which has problems setting up standard input and output.
@@ -59,10 +59,10 @@ editor = whatever
</pre>
<h4>Configuring a Merge program</h4>
- It should be emphasized that Mercurial by itself doesn't attempt to do a
+ 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
+ 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 <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information)
<h1>Reporting problems</h1>