diff tests/test-lock-badness @ 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 ff5c9a92f556
children c0b449154a90
line wrap: on
line diff