tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 15 Jul 2006 16:06:35 -0700
changeset 2621 5a5852a417b1
parent 2175 b2ae81a7df29
permissions -rw-r--r--
clone: disable stream support on server side by default. enable in hgrc like this: [server] stream=True

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)