diff tests/test-merge6.out @ 6269:ffdf70e74623

merge: privatize some functions, unnest some others
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Mar 2008 10:02:31 -0500
parents 8feb33c2d153
children 0750f11152fe
line wrap: on
line diff