view tests/test-merge4.out @ 5441:f9c2917a9f7a

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Tue, 09 Oct 2007 17:25:24 -0500
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)