diff tests/test-merge2.t @ 20965:774ff56cbe34

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2014 12:41:39 -0400
parents f2719b387380
children 1850066f9e36
line wrap: on
line diff