diff tests/test-merge5.t @ 15072:91d2efecb245

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Sep 2011 18:30:44 -0500
parents 610873cf064a
children 6da47b655d97
line wrap: on
line diff