diff tests/test-merge3.out @ 9985:279282ca42f0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Dec 2009 19:30:30 -0600
parents 91c56c427171
children
line wrap: on
line diff