diff hgmerge @ 4117: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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff