comparison mercurial/merge.py @ 3224:394ac87f3b74

[extendedchangelog] encode/decode function encode '\n', '\r' and '\0'
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 02 Oct 2006 22:35:37 +0200
parents 9e002614f2eb
children 3fd098e0902d
comparison
equal deleted inserted replaced
3223:35d61e653174 3224:394ac87f3b74