diff tests/test-merge1.t @ 16253:17f179805297

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Mar 2012 17:05:42 -0500
parents 44fa047cef57
children f2719b387380
line wrap: on
line diff