diff tests/test-copy-move-merge.t @ 16871:d566aa319d5f

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Jun 2012 17:57:57 -0500
parents e9ae770eff1c
children f2719b387380
line wrap: on
line diff