comparison tests/test-merge1.t @ 14481:b2ee161328e0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 31 May 2011 15:28:23 -0500
parents ffb5c09ba822
children 1e9451476bf8
comparison
equal deleted inserted replaced
14480:a21246c7e7d7 14481:b2ee161328e0