comparison tests/test-merge8.t @ 16778:2ac08d8b21aa

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 22 May 2012 14:37:20 -0500
parents 518b90d66fad
children f2719b387380
comparison
equal deleted inserted replaced
16777:058e14da7044 16778:2ac08d8b21aa