view tests/test-merge4.out @ 5128:c9126c24e098

record: work properly if invoked in a subdirectory
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 06 Aug 2007 12:53:17 -0700
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

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)