diff tests/test-merge7.t @ 14481:b2ee161328e0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 31 May 2011 15:28:23 -0500
parents ec5886db9dc6
children 2371f4aea665
line wrap: on
line diff