comparison tests/test-merge2.t @ 19115:55154cea5550

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 02 May 2013 12:15:41 -0500
parents f2719b387380
children 1850066f9e36
comparison
equal deleted inserted replaced
19066:2cad301a7f06 19115:55154cea5550