diff tests/test-merge5 @ 3005:c67920d78248

merge: remove redundant if
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:42:55 -0500
parents 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff