# HG changeset patch
# User Greg Ward <greg-hg@gerg.ca>
# Date 1241480276 14400
# Node ID 062425ee334f8946a5ef9170b6edeeafdab8a2ef
# Parent  87873075e12866e33dfe89229dd1288e1c72613a
parser: do not blow up if we see EOF right after a 'merge' line.

diff -r 87873075e128 -r 062425ee334f fastimport/parser.py
--- a/fastimport/parser.py	Mon May 04 11:30:04 2009 -0400
+++ b/fastimport/parser.py	Mon May 04 19:37:56 2009 -0400
@@ -405,7 +405,9 @@
     def _get_merge(self):
         """Parse a merge section."""
         line = self.next_line()
-        if line.startswith('merge '):
+        if line is None:                # EOF after last "merge" line
+            return None
+        elif line.startswith('merge '):
             return line[len('merge '):]
         else:
             #print "not a merge:", line