diff tests/test-rename-merge2.t @ 21585:652e07debf10

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 27 May 2014 17:41:20 -0700
parents cb15835456cb
children 6a254a2dd37c
line wrap: on
line diff