Fix GitTemporaryHead

Author: mhagger

git-imerge

@@ -282,8 +282,11 @@ class GitTemporaryHead(object):
 
     """
 
-    def __enter__(self, git, message):
+    def __init__(self, git, message):
+        self.git = git
         self.message = message
+
+    def __enter__(self):
         try:
             self.head_name = check_output(['git', 'symbolic-ref', '--quiet', 'HEAD']).strip()
         except CalledProcessError:

t/test-conflicted

@@ -26,7 +26,7 @@ git checkout c
 "$GIT_IMERGE" autofill 2>&1 | tee autofill.out
 if grep -q Traceback autofill.out
 then
-    echo 'KNOWN FAILURE!'
+    exit 1
 fi
 "$GIT_IMERGE" diagram --commits --frontier --html=imerge1.html
 "$GIT_IMERGE" continue --edit