diff tests/test-basic.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 57729c56a23c
children 8feb33c2d153
line wrap: on
line diff