Mercurial > hg > mercurial-crew-with-dirclash
diff hgmerge @ 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 | 6a03cff2b0f5 |
children | e4480f2b61e9 |