diff tests/test-merge10.t @ 21220:b04a2f49cb55

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 01 May 2014 19:24:03 -0500
parents f2719b387380
children eb586ed5d8ce
line wrap: on
line diff