diff tests/test-merge2.t @ 20870:6500a2eebee8

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Apr 2014 15:11:19 -0500
parents f2719b387380
children 1850066f9e36
line wrap: on
line diff