Mercurial > hg

view tests/test-merge5.out @ 1783:35a05f177267

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with matt
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 22 Feb 2006 05:21:09 +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)