diff tests/test-merge5 @ 3233:3fd098e0902d

merge: extend file merge function for renames
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 12:04:48 -0500
parents 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff