3 commits

Author	SHA1	Message	Date
Avery Pennarun	96db2c0448	Okay, that was a little too aggressive. ... Now we only prune out a commit if it has exactly one remaining parent and that parent's tree is identical to ours. But I also changed the test to create the initial "-s ours" merge in one step instead of two, and that merge can be eliminated since one of its parents doesn't affect the subdir at all, and is thus deleted.	2009-04-24 22:38:58 -04:00
Avery Pennarun	d691265880	Even more aggressive commit trimming. ... Now we cut out a commit if any of its parents had the same tree; just use that parent in its place. This makes the history look nice, but I don't think it's quite right...	2009-04-24 22:05:30 -04:00
Avery Pennarun	847e868167	Quick test script for generating reasonably complex merge scenarios.	2009-04-24 21:35:50 -04:00