diff tests/test-merge-default.t @ 15186:a9b0f5624ffc stable

Added signature for changeset 351a9292e430
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Oct 2011 15:49:29 -0500
parents 4134686b83e1
children 41885892796e 6c8573dd1b6b
line wrap: on
line diff