diff tests/test-merge10.t @ 17757:fec69c72e2b4

merge with durin42
author Matt Mackall <mpm@selenic.com>
date Fri, 12 Oct 2012 15:52:59 -0500
parents f2719b387380
children eb586ed5d8ce
line wrap: on
line diff