Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1521:11a58d2cdffb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy the mode of the file when breaking hardlinks
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 09 Nov 2005 13:38:46 -0800
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)