tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Mon, 17 Jul 2006 07:43:15 -0700
changeset 2623 d1cbfe9e13cd
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix problem with uncompressed clone and python 2.3.

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)