--- a/mercurial/commands.py Wed Aug 17 14:11:46 2011 +0200
+++ b/mercurial/commands.py Wed Aug 17 14:17:35 2011 +0200
@@ -4075,7 +4075,7 @@
- :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
files, discarding any previous merge attempts. Re-merging is not
performed for files already marked as resolved. Use ``--all/-a``
- to selects all unresolved files. ``--tool`` can be used to specify
+ to select all unresolved files. ``--tool`` can be used to specify
the merge tool used for the given files. It overrides the HGMERGE
environment variable and your configuration files.
--- a/mercurial/pure/osutil.py Wed Aug 17 14:11:46 2011 +0200
+++ b/mercurial/pure/osutil.py Wed Aug 17 14:17:35 2011 +0200
@@ -73,7 +73,7 @@
# find_msvcrt was introduced in Python 2.6
return ctypes.util.find_msvcrt()
except AttributeError:
- return 'msvcr80.dll' # CPython 2.5
+ return 'msvcr71.dll' # CPython 2.5 and 2.4
_crt = ctypes.PyDLL(_crtname())