Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2337:3f24bc5dee81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
http: fix many problems with url parsing and auth. added proxy test. problems fixed: - https scheme handled properly for real and proxy urls. - url of form "http://user:password@host:port/path" now ok. - no-proxy check uses proper host names.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 22 May 2006 15:42:49 -0700
parents b2ae81a7df29
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)