diff tests/test-merge5.t @ 19327:cf1b0a58a0de

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Jun 2013 15:31:40 -0500
parents 6da47b655d97
children 76df01e56e7f
line wrap: on
line diff