Merge branch 'jk/merge-file-exit-code'

diff --git a/git-p4.py b/git-p4.py
index daa60c60d6703ae76fd5cd168907f598207844d3..212ef2be9670bc2fe5573eee856471113eb96889 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -24,6 +24,7 @@
 import stat
 import zipfile
 import zlib
+import ctypes
 
 try:
     from subprocess import CalledProcessError