diff tests/test-simple-update @ 3167: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 0902ffece4b4
children ad3d5b4367cb
line wrap: on
line diff