diff tests/test-merge-revert.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 d2b55e3c4e25
children
line wrap: on
line diff