Mercurial > hg-stable
diff contrib/win32/ReadMe.html @ 5081:ea7b982b6c08
Remove trailing spaces
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 07 Aug 2007 10:24:33 +0200 |
| parents | fb4b6d5fe100 |
| children | 876acbe2f856 |
line wrap: on
line diff
--- a/contrib/win32/ReadMe.html Mon Aug 06 20:25:50 2007 +0200 +++ b/contrib/win32/ReadMe.html Tue Aug 07 10:24:33 2007 +0200 @@ -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 @@ </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>