diff tests/test-merge-local.t @ 23394:b5e2128ce9e6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Nov 2014 17:30:05 -0600
parents 2371f4aea665
children ef1eb6df7071
line wrap: on
line diff