diff tests/test-conflict @ 4115:c95060a5391a

merge: fix renaming of subdirectories under renamed directories
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Feb 2007 16:20:06 -0600
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff