log tests/test-rename-merge1.out @ 3299:e7abcf3a7c5f

age author description
Mon, 09 Oct 2006 21:27:04 -0500 Matt Mackall filemerge: use contexts rather than my and other
Sun, 08 Oct 2006 19:57:45 -0500 Matt Mackall merge: remember rename copies and parents properly on commit
Fri, 06 Oct 2006 16:55:11 -0500 Matt Mackall merge: copy fixes and tests
Wed, 04 Oct 2006 19:08:04 -0500 Matt Mackall merge: fixes for merge+rename
Mon, 25 Sep 2006 16:45:31 -0500 Matt Mackall Add core copy detection algorithm