diff tests/test-merge1 @ 3005:c67920d78248

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