diff tests/test-rename-merge2.t @ 17352:c6f88e7f95b7

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 11 Aug 2012 12:45:53 -0500
parents f2719b387380
children a6fe1b9cc68f
line wrap: on
line diff