diff tests/test-merge5 @ 3442:798bcde0c9c2

merge: fix branch setting (and remove debugging message)
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:59:01 -0500
parents 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff