diff tests/test-merge5.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 fffc8a733bf9
children 4b0c9c674707
line wrap: on
line diff