Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3399:5dbb3a991bbf
Catch python2.3's IndexError with bogus http proxy settings. (issue203)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 15 Oct 2006 21:09:56 +0200 |
parents | 49988d9f0758 |
children | 41989e55fa37 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes