diff tests/test-merge2.t @ 13313:0c493e5ce8e9

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Jan 2011 17:22:37 -0600
parents 4c94b6d0fb1c
children ffb5c09ba822
line wrap: on
line diff