diff doc/hgmerge.1.txt @ 3843:abaa2cd00d2b

make transcoding more robust default to ASCII abort if unknown encoding wrap abort strings with _ add test
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Dec 2006 12:46:01 -0600
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff