diff hgext/hgk.py @ 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 eb0906ebba81
children 0e68608bd11d
line wrap: on
line diff