diff tests/test-resolve @ 9982:ddc899096b7b

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Dec 2009 14:37:33 -0600
parents 6c82beaaa11a
children 51021f4c80b5
line wrap: on
line diff