diff tests/test-newbranch.out @ 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 9433bdcaa9ae
children 4574a8cb080f
line wrap: on
line diff