tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 05 Oct 2006 20:03:38 +0200
changeset 3268 6901d3545021
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Some versions of sed don't support .\+, so use ..* instead. Reported by Christian Ebert for MacOS X.

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)