diff tests/test-merge3 @ 1234:9ee8428d84a1

Revert unrelated changes in previous commit
author mpm@selenic.com
date Tue, 13 Sep 2005 14:22:48 -0500
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line diff