tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 25 Apr 2006 23:28:40 +0200
changeset 2129 e5f5c21f4169
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
cached data was wrong: rev is different from self.rev(node) in bundlerepo.py

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)