diff tests/test-merge5.t @ 26418:0afb81bdf374 stable

Added tag 3.5.2 for changeset 9a466b9f9792
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Oct 2015 12:06:56 -0500
parents fe80fdf68ba7
children 72072cfc7e91
line wrap: on
line diff