diff tests/test-merge1.out @ 642:5d6177b72fcc

Update tests
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jul 2005 22:27:25 -0800
parents 5b22029b5aa2
children 7e4843b7efd2
line wrap: on
line diff