diff tests/test-walk.out @ 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 9d1c3529ebbc
children 01c4ea5e788c c93562fb12cc
line wrap: on
line diff