tests/test-merge4.out
author Lee Cantey <lcantey@gmail.com>
Thu, 13 Jul 2006 11:19:35 -0700
changeset 2610 7a87aebd848e
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Fix sed expression for OS X and Solaris 2.6. Matches previous fixes in other tests.

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)