diff tests/test-merge1.t @ 21992:6be1e1dbe6a0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Aug 2014 14:32:34 -0500
parents 94c394653b2a
children 1ef96a3b8b89
line wrap: on
line diff