diff tests/test-flags.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 b2ae81a7df29
children 455109df3669 966632304dde
line wrap: on
line diff