X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gitMergeCommon.py;h=7e7f317119b4a7082e9151053ad28225f151f1aa;hb=654291a2acb1c28b884cb9376a0d7eb5f8c090b5;hp=dfa49ff7ec95453d680020866e3c9658b1f77870;hpb=720d150c48fc35fca13c6dfb3c76d60e4ee83b87;p=git.git

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index dfa49ff7..7e7f3171 100644
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -10,6 +10,10 @@ if sys.version_info[0] < 2 or \
 
 import subprocess
 
+def die(*args):
+    printList(args, sys.stderr)
+    sys.exit(2)
+
 # Debugging machinery
 # -------------------
 
@@ -28,11 +32,11 @@ def debug(*args):
         if funcName in functionsToDebug:
             printList(args)
 
-def printList(list):
+def printList(list, file=sys.stdout):
     for x in list:
-        sys.stdout.write(str(x))
-        sys.stdout.write(' ')
-    sys.stdout.write('\n')
+        file.write(str(x))
+        file.write(' ')
+    file.write('\n')
 
 # Program execution
 # -----------------