# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2008-04-12 18:51:26
# Node ID 4b92591c69a7911faea70dbe9d7a92b92b2b7bd3
# Parent  0c611355481b355794dae450dbba7e6403688893

merge: replace readline() call, missing from posixfile_nt

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -21,11 +21,15 @@ class mergestate(object):
     def _read(self):
         self._state = {}
         try:
+            localnode = None
             f = self._repo.opener("merge/state")
-            self._local = bin(f.readline()[:-1])
-            for l in f:
-                bits = l[:-1].split("\0")
-                self._state[bits[0]] = bits[1:]
+            for i, l in enumerate(f):
+                if i == 0:
+                    localnode = l[:-1]
+                else:
+                    bits = l[:-1].split("\0")
+                    self._state[bits[0]] = bits[1:]
+            self._local = bin(localnode)
         except IOError, err:
             if err.errno != errno.ENOENT:
                 raise