Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2259:181b0643ffb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix a traceback when unbundling does not add any changesets only run the hooks when some changesets has been added
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 11 May 2006 15:01:30 +0200
parents b2ae81a7df29
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)