diff tests/test-command-template.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 031aac7ec584
children 3380eb6d7c32
line wrap: on
line diff