diff tests/test-merge-default.out @ 3005:c67920d78248

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