view tests/test-merge4.out @ 3089:d0fcce3728d1

hgk: add revision numbers
author Brendan Cully <brendan@kublai.com>
date Wed, 13 Sep 2006 13:50:28 -0700
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)