diff tests/test-conflict @ 1231:effff847870f

CONTRIBUTORS update
author mpm@selenic.com
date Fri, 09 Sep 2005 12:19:24 -0700
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line diff