diff tests/test-copy-move-merge.t @ 16261:7b9bf72430ba

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 15 Mar 2012 13:11:42 -0500
parents efdcce3fd2d5
children e9ae770eff1c
line wrap: on
line diff