diff hgext/hgk.py @ 3200:e67c22bc8bba

merge: use repo.parents and parent contexts in update
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 16:39:38 -0500
parents edefbb3a3b08
children eb0906ebba81
line wrap: on
line diff