diff tests/test-conflict @ 3775:a88e02081a88

Add global options for setting encoding and encodingmode
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Dec 2006 16:16:33 -0600
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff