diff tests/test-merge6.t @ 29454:ddbff1435e7b stable

Added signature for changeset 26a5d605b868
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Jul 2016 15:12:33 -0500
parents f2719b387380
children 2428e8ec0793
line wrap: on
line diff