Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2583:6e5427447f4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding local_hostname option to smtp configuration
author Valentino Volonghi aka dialtone <dialtone@divmod.com>
date Sun, 09 Jul 2006 14:12:19 +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)