diff tests/test-rename-merge1.t @ 26014:a5f62af29517

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 12 Aug 2015 17:01:50 -0500
parents bd625cd4e5e7
children d8463a743d7d
line wrap: on
line diff