Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1818:9bbc7b304c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the deprecated rawcommit an alias of debugrawcommit. This way it doesn't show up in the non-debug help.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 01 Mar 2006 09:14:25 +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)