Mercurial > hg
view tests/test-merge5.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 | 0b89315d5de2 |
children | 68a1b9d0663e |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b created new head % should abort abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) % should succeed abort: crosses branches (use 'hg merge' or 'hg update -C')