3 Commits

Author	SHA1	Message	Date
Thomas Arendsen Hein	3019bb7a0b	Kill trailing spaces	2007-06-21 09:25:49 +02:00
Matt Mackall	2085d36412	make manifest friendlier ... switch to using context code ..which uses first parent by default show file hashes only with debug switch show permissions with verbose fix up tests	2006-11-30 22:38:48 -06:00
Alexis S. L. Carvalho	846337c179	Test that we notice the empty files from the second parent during a merge ... This didn't work with 0.9.1, but was fixed by 41b753e617ee.	2006-10-25 02:51:27 -03:00