merge default into stable for 2.3 code freeze stable 2.3-rc
authorMatt Mackall <mpm@selenic.com>
Wed, 18 Jul 2012 19:08:25 -0500
branchstable
changeset 17225 a06e2681dd17
parent 17222 98823bd0d697 (diff)
parent 17224 23b247234454 (current diff)
child 17226 436cc9d017c6
merge default into stable for 2.3 code freeze
mercurial/httpclient/tests/__init__.py
mercurial/httpclient/tests/simple_http_test.py
mercurial/httpclient/tests/test_bogus_responses.py
mercurial/httpclient/tests/test_chunked_transfer.py
mercurial/httpclient/tests/test_proxy_support.py
mercurial/httpclient/tests/test_ssl.py
mercurial/httpclient/tests/util.py
mercurial/httprepo.py
mercurial/repo.py
mercurial/sshrepo.py
tests/test-clone-failure.t
tests/test-commit-copy.t
tests/test-convert-baz
tests/test-convert-baz.out
tests/test-convert-p4
tests/test-convert-p4-filetypes
tests/test-convert-p4-filetypes.out
tests/test-convert-p4.out
tests/test-copy2.t
tests/test-remove-new.t