diff tests/test-merge1.t @ 21764:cd3c79392056

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:59:36 -0500
parents 94c394653b2a
children 1ef96a3b8b89
line wrap: on
line diff