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 Thomas Arendsen Hein <thomas@intevation.de>
Wed, 12 Jul 2006 09:01:10 +0200
changeset 2599 e4b5e48052c6
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Added tests for local and remote init. This tests the changes done in edb66cb05ded and b898afee9d0d.

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)
mercurial-crew-with-dirclash