diff tests/test-merge7.out @ 8755:a2b4ddee3785

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:21:13 -0500
parents af5f099d932b
children b2310903c462
line wrap: on
line diff