# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1467730514 -10800
# Node ID a8fdecd4be61313d6f863698667d32600f7ba64d
# Parent  51c87abe5a1ef460738509eb86235ee3a21d1899
Fixes to Unicode handling.

diff -r 51c87abe5a1e -r a8fdecd4be61 multimerge.py
--- a/multimerge.py	Tue Jul 05 16:45:35 2016 +0300
+++ b/multimerge.py	Tue Jul 05 17:55:14 2016 +0300
@@ -36,7 +36,7 @@
 ## because of piped output not having a defined encoding. We default
 ## to UTF-8 encoding in output here.
 def gcm_print(smsg):
-    gcm_msgbuf.append(smsg.encode("UTF-8"))
+    gcm_msgbuf.append(smsg)
     if sys.stdout.encoding != None:
         print(smsg.encode(sys.stdout.encoding))
     else:
@@ -67,7 +67,7 @@
     if cfg.debug:
         gcm_print(u"DBG: "+ smsg)
     else:
-        gcm_msgbuf.append(u"DBG: "+ smsg.encode("UTF-8"))
+        gcm_msgbuf.append(u"DBG: {0}".format(smsg))
 
 
 ## Handler for SIGINT signals