view tests/test-merge5.out @ 4688:39001f4b7d99

hgk: Use $HG instead of hg (see 849f011dbf79)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jun 2007 21:10:55 +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