diff tests/test-merge-local.t @ 13205:18f0084a97c8

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 28 Dec 2010 13:31:30 -0600
parents 4134686b83e1
children 2371f4aea665
line wrap: on
line diff