log tests/test-issue522 @ 6461:eb69e7989145

age author description
Thu, 23 Aug 2007 01:48:29 -0300 Alexis S. L. Carvalho merge: forcefully mark files that we get from the second parent as dirty