diff tests/test-merge1.t @ 20875:cc62c9d6887a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Apr 2014 17:59:06 -0500
parents 94c394653b2a
children 1ef96a3b8b89
line wrap: on
line diff