comparison mercurial/localrepo.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 ff15ba23c1cf
children 53e843840349 8d4855fd9d7b
comparison
equal deleted inserted replaced
3199:ebdb3f616bc0 3200:e67c22bc8bba