comparison tests/test-merge-types.t @ 14481:b2ee161328e0

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