diff tests/test-merge8.out @ 3729:581d20773326

merge: add copied hash to simplify copy logic
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
parents 9103dab96093
children 4787e2b0dd03
line wrap: on
line diff