diff tests/test-merge-revert2.t @ 14885:50b67d5c4073

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Jul 2011 14:27:16 -0500
parents 4134686b83e1
children 2371f4aea665
line wrap: on
line diff