comparison tests/test-merge5.out @ 3005:c67920d78248

merge: remove redundant if
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:42:55 -0500
parents 49988d9f0758
children 41989e55fa37
comparison
equal deleted inserted replaced
3004:31011730f9bd 3005:c67920d78248