Mercurial > hg

view tests/test-merge5.out @ 4044:78a0dd93db0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Abort on empty username so specifying a username can be forced. This behaviour was introduced by c3345b0f2fcd and broken by 98f2507c5551. Added test for this.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 24 Jan 2007 23:04:51 +0100
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