tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 08 Aug 2006 17:08:59 -0700
changeset 2816 2a0c599f7bb0
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fetch: hold lock and wlock across all operations

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)