diff tests/test-merge1.out @ 3778:5da370c2f72d

Add a charset encoding test case
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Dec 2006 16:16:33 -0600
parents 3109f012c305
children
line wrap: on
line diff