diff tests/test-double-merge.out @ 8859:580a79dde2a3

hgweb: web.encoding should override encoding.encoding (issue1183)
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Jun 2009 13:00:25 -0500
parents af5f099d932b
children d8143769e1d4
line wrap: on
line diff