diff tests/test-resolve.t @ 15566:7786b7dfbc46

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Nov 2011 16:35:17 -0600
parents de793925862e
children f2719b387380
line wrap: on
line diff