tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 10 May 2006 11:10:18 -0700
changeset 2250 45aef5ddcdbe
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
windows: revlog.lazyparser not always safe to use. can not use on windows < nt or if win32 api not available.

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)