Merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 27 Feb 2009 08:13:42 -0600
changeset 7803 6d99ff7b79b5
parent 7802 dd970a311ea8 (diff)
parent 7801 e5627562b9f2 (current diff)
child 7810 b136c6c5c1c7
Merge with stable
hgext/convert/cvsps
hgext/imerge.py
mercurial/localrepo.py
mercurial/osutil.py
mercurial/version.py