diff tests/test-conflict @ 3779:b4cc5d221dc6

Add output for encoding test
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Dec 2006 16:31:25 -0600
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff