diff tests/test-merge7.t @ 20563:06f46bad8714

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Feb 2014 18:49:09 -0600
parents bcf29565d89f
children 19d6fec60b81
line wrap: on
line diff