Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4533:36abb07c79d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed trailing \n in calls to util.Abort()
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 09 Jun 2007 13:25:54 +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