diff mercurial/filemerge.py @ 17360:935831597e16 stable

rollback: write dirstate branch with correct encoding
author Sune Foldager <cryo@cyanite.org>
date Wed, 15 Aug 2012 12:04:50 +0200
parents c655e4acaa82
children 9a2cf955db84
line wrap: on
line diff