4 Commits

Author	SHA1	Message	Date
Matt Mackall	6bf7f7256d	merge: fix spurious merges for copies in linear updates ... We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.	2007-05-08 02:59:13 -05:00
Matt Mackall	ebc2b5ccc8	merge: fix a bug where copies were ignored	2007-04-05 16:43:18 -05:00
Thomas Arendsen Hein	ecaffdb830	Fix test-rename-dir-merge for different implementations of ls.	2006-12-01 15:40:23 +01:00
Matt Mackall	d664d787b4	Add missing test output	2006-11-30 19:50:28 -06:00