diff tests/test-cat.out @ 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 7544700fd931
children f5b00b6e426a
line wrap: on
line diff