Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4660:cfa477946181

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust note about variables not being set for empty values.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 21 Jun 2007 09:45:33 +0200
parents fffc8a733bf9
children
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