diff tests/test-resolve.out @ 11172:e9226eb3af2a

Merge with 1.5.3
author Matt Mackall <mpm@selenic.com>
date Thu, 13 May 2010 11:33:11 -0500
parents b2310903c462
children 51021f4c80b5
line wrap: on
line diff