Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1634:f49f602fae92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy & rename can ignore removed source files As mercurial now distinguishes deleted files from removed files, we can skip removed source files while copying or renaming.
author Robin Farine <robin.farine@terminus.org>
date Tue, 24 Jan 2006 13:59:01 +1300
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)