comparison tests/test-rebase-newancestor.t @ 21220:b04a2f49cb55

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 01 May 2014 19:24:03 -0500
parents aa9385f983fa
children 65f215ea3e8e
comparison
equal deleted inserted replaced
21159:024f38f6d5f6 21220:b04a2f49cb55