diff tests/test-log.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 f80cf8b7bbd9
children e0bc2c575044
line wrap: on
line diff