5 Commits

Author	SHA1	Message	Date
Matt Mackall	5fa7270b2d	Merge with stable	2007-05-08 11:42:48 -05:00
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
Alexis S. L. Carvalho	a4fb0722ca	change tests to use simplemerge by default	2007-04-16 20:17:39 -03:00
Matt Mackall	ebc2b5ccc8	merge: fix a bug where copies were ignored	2007-04-05 16:43:18 -05:00
Thomas Arendsen Hein	a721ac99f0	Add instructions how to redo/finish failed merge with local working directory. ... d29fcc4d1e2a already implemented this for branch merges.	2006-12-11 18:09:52 +01:00