log tests/test-rename-dir-merge2.out @ 4311:4787e2b0dd03

age author description
Thu, 05 Apr 2007 16:43:18 -0500 Matt Mackall merge: fix a bug where copies were ignored