diff tests/test-conflict @ 5063:86327d13d916

imerge: handle renames
author Brendan Cully <brendan@kublai.com>
date Fri, 03 Aug 2007 18:05:20 -0700
parents 93a4e72b4f83
children
line wrap: on
line diff