diff tests/test-merge-types.t @ 16065:8af9e08a094f

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 03 Feb 2012 15:45:13 -0600
parents efdcce3fd2d5
children ca5cc2976574
line wrap: on
line diff