diff hgeditor @ 2914:f28f4c850cd8

merge: hoist some working manifest logic out of merge loop
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 16:27:19 -0500
parents 20b621154e17
children d9b8d28c0b94
line wrap: on
line diff