comparison tests/test-conflict @ 3005:c67920d78248

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