comparison tests/test-merge1.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 3682a19bb637
children d8143769e1d4
comparison
equal deleted inserted replaced
8858:16f6c13706df 8859:580a79dde2a3