comparison tests/test-resolve.t @ 22132:a076a196641b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 12 Aug 2014 17:22:57 -0500
parents b081decd9062
children dfad19274d85
comparison
equal deleted inserted replaced
22131:8768342af0cd 22132:a076a196641b