tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Fri, 08 Dec 2006 17:10:40 -0800
changeset 3836 925b1816c746
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
Fix hg serve -6 getsockname handling

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)