view tests/test-merge4.out @ 4505:0ca5ef554987

Fix bug in "hg serve -v"
author Joel Rosdahl <joel@rosdahl.net>
date Mon, 04 Jun 2007 21:49:01 +0200
parents b2ae81a7df29
children
line wrap: on
line source

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)