diff tests/test-flags @ 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 e506c14382fd
children 455109df3669
line wrap: on
line diff