diff tests/test-merge5.t @ 25195:472a685a4961

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 May 2015 07:17:57 -0500
parents fe80fdf68ba7
children 72072cfc7e91
line wrap: on
line diff