diff tests/test-up-local-change.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 fffc8a733bf9
children 17ed9b9a0d03
line wrap: on
line diff