diff tests/test-ui-config.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 24c1db20990c
children 3fef134832d8
line wrap: on
line diff