diff tests/test-issue322.out @ 4309:09c5f734ff6a

merge: fix a bug where copies were getting ignored
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Apr 2007 16:25:47 -0500
parents 3d5547845158
children e3dffbdc6522
line wrap: on
line diff