view tests/test-merge2.out @ 8808:38305de95f1d

gpg: unbreak 02a12835b17e. We need a test.
author Brendan Cully <brendan@kublai.com>
date Sun, 14 Jun 2009 12:18:46 -0700
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head