tests/test-merge4.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 22 Jan 2009 14:33:49 +0100
changeset 7680 89c2b78faec4
parent 6336 4b0c9c674707
permissions -rw-r--r--
tests: eliminate use of sed -i (which fails on NetBSD)

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