tests/test-merge4.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 26 Oct 2007 16:43:13 -0700
changeset 5482 7ceb740f2fef
parent 2175 b2ae81a7df29
permissions -rw-r--r--
See if execute bit is honoured when we go back in time

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)