diff tests/test-merge2.t @ 12010:ce818cf215dc

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Aug 2010 10:48:49 -0500
parents b28fc3b3efd6
children 4c94b6d0fb1c
line wrap: on
line diff