diff hgeditor @ 5857:c704b03884ef

merge: add a bit more sanity to divergent copy checks
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Jan 2008 16:28:32 -0600
parents b5bbfa18daf7
children 43337076ba92
line wrap: on
line diff