diff tests/test-merge-default.out @ 5764:8a5d8fb59ed2

Backed out changeset c2a21fe60994 Unfortunately, this breaks backward compatibility.
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Dec 2007 17:47:02 -0600
parents 9cd6578750b9
children 4b0c9c674707
line wrap: on
line diff