tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:06:43 +0200
changeset 4511 1d46169ec197
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Fixed test output for changed glog (. instead of @)

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