tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Oct 2007 14:23:28 +0200
changeset 5361 8ab7de07f40e
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-convert-git: support older git client (1.4.4.4)

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