Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1678:b345cc4c22c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reverting 11d12bd6e1dcd9610fa26e97d25e7ad553e8ffa5 passing local everywhere violate the layering
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Dec 2005 18:04:05 +0100
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

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)