view tests/test-merge8.out @ 9122:a9eae2f3241c

url: fix use of non-int port in https connections via proxy Complements eef406165507 (issue1725).
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Tue, 14 Jul 2009 17:12:12 -0300
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved