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
Matt Mackall	f9f3aa2d91	avoid unnecessary copy merges	2006-11-18 11:34:19 -06:00
Thomas Arendsen Hein	ccb1957113	Test for 1de7d8df2123 (update dirstate correctly for non-branchmerge updates) ... (Test case created by Johannes Hofmann)	2006-10-14 10:53:29 +02:00