Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 1488:08c7851969cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
only files in normal state should be marked as deleted fix a traceback when you removed an added file
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 02 Nov 2005 16:08:48 -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)