tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Thu, 26 Oct 2006 22:28:33 -0700
changeset 3560 6106236bc4eb
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
zsh: support remote URLs

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)