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 Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 21 Apr 2006 15:47:27 -0700
changeset 2114 98cc126f9f3f
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
update tests after changing archival code. test-archive now contains tests for archive command.

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