7 Commits

Author	SHA1	Message	Date
Alexis S. L. Carvalho	274bce0c1c	run-tests.py: pass -L/--label to simplemerge ... This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.	2007-04-28 17:55:45 -03:00
Alexis S. L. Carvalho	a4fb0722ca	change tests to use simplemerge by default	2007-04-16 20:17:39 -03:00
Benoit Boissinot	e005ffc8c4	switch to the .hg/store layout, fix the tests	2006-12-01 13:34:09 +01:00
Vadim Gelfer	e5df462a15	deprecate 'update -m'. use 'merge' instead.	2006-05-14 21:07:34 -07:00
Thomas Arendsen Hein	1b244c77c7	Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. ... Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.	2006-03-13 13:05:41 +01:00
Matt Mackall	227eff2fe8	Make test-merge7 repeatable	2005-09-27 14:53:11 -07:00
Matt Mackall	f2dd52a8e4	Repair ancestor logic, fix up test cases	2005-09-26 16:52:47 -07:00