diff hgmerge @ 2487:041363739ca8

Test case for #294
author Brendan Cully <brendan@kublai.com>
date Fri, 23 Jun 2006 08:10:06 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff