tests/test-merge4.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 09 Aug 2007 20:03:34 -0700
changeset 5139 49554ba98951
parent 2175 b2ae81a7df29
permissions -rw-r--r--
debugstate: print symlinks as 'lnk', not '777'

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)