diff tests/test-merge1.out @ 3089:d0fcce3728d1

hgk: add revision numbers
author Brendan Cully <brendan@kublai.com>
date Wed, 13 Sep 2006 13:50:28 -0700
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff