comparison tests/test-merge-default.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 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
3210:7240f9e47144 3233:3fd098e0902d