log tests/test-rename-merge2.out @ 4505:0ca5ef554987

age author description
Tue, 08 May 2007 02:59:13 -0500 Matt Mackall merge: fix spurious merges for copies in linear updates