view tests/test-merge4.out @ 4420:b0656b33cc02

add test for patchbomb extension.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 08 May 2007 12:20:13 -0700
parents b2ae81a7df29
children
line wrap: on
line source

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