Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5476:b3afa6725082

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
httprepo: ignore environment proxies when proxies are disabled
author Sebastian Hauer <sebastian.hauer@gmail.com>
date Wed, 24 Oct 2007 22:15:45 +0200
parents fffc8a733bf9
children
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