tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Jun 2007 16:00:40 +0200
changeset 4471 736e49292809
parent 2175 b2ae81a7df29
permissions -rw-r--r--
addremove: comparing two empty files caused ZeroDivisionError (found by Giorgos Keramidas)

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)