diff tests/test-merge5.t @ 15660:c7b0bedbb07a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 15 Dec 2011 16:50:21 -0600
parents 610873cf064a
children 6da47b655d97
line wrap: on
line diff