diff tests/test-merge2 @ 3821:158fce02dc40

Teach convert-repo to deal with mixed charsets in git
author Matt Mackall <mpm@selenic.com>
date Thu, 07 Dec 2006 18:03:28 -0600
parents 7544700fd931
children 9dcf9d45cab8
line wrap: on
line diff