diff mercurial/changelog.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 ad6aecaf4eed
children 394ac87f3b74
line wrap: on
line diff