diff tests/test-merge1 @ 7541:11660d2918af

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Dec 2008 16:27:51 -0600
parents a6477aa893b8
children 50b6af595e0c
line wrap: on
line diff