Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge5.out
author Peter van Dijk <peter@dataloss.nl>
Wed, 22 Feb 2006 16:11:17 +0100
changeset 1927 397b62d5dd13
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
add http_proxy= lines to test-bad-pull and test-pull

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)
mercurial-crew-with-dirclash