Mercurial > hg

view tests/test-merge5.out @ 2581:54b152379589

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow use of extensions in python hooks extensions are loaded with hgext_ prefix, try to use them if the module is not found in the normal path
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 09 Jul 2006 11:10:11 +0200
parents b2ae81a7df29
children 49988d9f0758
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)