diff tests/test-backout.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 2ace3bf43089
children e8ee8fdeddb1
line wrap: on
line diff