diff hgeditor @ 3240:8d4855fd9d7b

merge: use new working context object in update
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Oct 2006 01:21:46 -0500
parents d9b8d28c0b94
children 7a7d4937272b
line wrap: on
line diff