Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1513:5c3b93b244aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy & rename don't overwrite unless --force is specified
author Robin Farine <robin.farine@terminus.org>
date Tue, 08 Nov 2005 10:35:09 -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)