view tests/test-merge4.out @ 12611:1f6bd49383b3 stable

Added signature for changeset 93d8bff78c96
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Oct 2010 10:18:57 -0500
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)