log tests/test-rename-merge1 @ 3257:c93ce7f10f85

age author description
Wed, 04 Oct 2006 19:08:04 -0500 Matt Mackall merge: fixes for merge+rename