diff tests/test-merge-default.out @ 3770:96095d9ff1f8

Add encoding detection
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Dec 2006 16:16:33 -0600
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff