diff tests/test-rename-merge2.t @ 16451:9c431cfdca12

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Apr 2012 16:50:25 -0500
parents efdcce3fd2d5
children e9ae770eff1c
line wrap: on
line diff