Mercurial > hg

view tests/test-merge5.out @ 4683:8c3d449ecc63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jun 2007 12:05:00 +0200
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes