diff tests/test-hgignore.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 0d36e3d7e2ea
children 4e521a3ee5eb
line wrap: on
line diff