comparison tests/test-rebase-collapse @ 12294:f2f6d838064a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 14 Sep 2010 16:21:21 -0500
parents 2313dc4d9817
children
comparison
equal deleted inserted replaced
12293:2ba12ffc1a32 12294:f2f6d838064a