log tests/test-merge9 @ 6087:12856a1742dc

age author description
Fri, 22 Jun 2007 20:44:40 -0300 Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename