log tests/test-rename-merge2.out @ 4703:bc63247c66e9

age author description
Thu, 21 Jun 2007 18:02:03 -0500 Matt Mackall merge: warn user about divergent renames