view tests/test-merge4.out @ 3600:932dadd2e614

zsh: add optional remote directory cache
author Brendan Cully <brendan@kublai.com>
date Tue, 31 Oct 2006 15:44:16 -0800
parents b2ae81a7df29
children
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)