diff tests/test-merge-tools.t @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents eac114e13b96
children 25d5a9ecbb85
line wrap: on
line diff