diff tests/test-merge2 @ 3862:46abbed02b2d

Use UTF-8 in .hg/branch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Dec 2006 20:35:28 -0200
parents 7544700fd931
children 9dcf9d45cab8
line wrap: on
line diff