Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4143:26314500a5e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798) with test added for a long (local) tag name.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 05 Mar 2007 19:48:21 +0100
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