diff tests/test-double-merge.out @ 11082:b8d0b4721aff stable

Added signature for changeset 39f725929f0c
author Matt Mackall <mpm@selenic.com>
date Sat, 01 May 2010 16:02:51 -0500
parents f2618cacb485
children db426935fa94
line wrap: on
line diff