diff mercurial/merge.py @ 3777:5da370c2f72d

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