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

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