diff tests/test-issue322.out @ 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 3d5547845158
children e3dffbdc6522
line wrap: on
line diff