diff tests/test-rename-merge1.t @ 22145:44d6818b9cd9

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Aug 2014 15:06:58 -0500
parents cb15835456cb
children a1a7c94def6d
line wrap: on
line diff