Index: trunk/scripts/git-migration/git-migrate
===================================================================
--- trunk/scripts/git-migration/git-migrate	(revision 1883)
+++ trunk/scripts/git-migration/git-migrate	(revision 1884)
@@ -82,14 +82,14 @@
 
 def mergeHistories():
-    grafts = []
-    for line in open('grafts'):
+    merges = []
+    for line in open('merges'):
         line = line.strip()
         if line[0] == '#' or line == '':
             continue
         
-        grafts.append(line.split())
+        merges.append(line.split())
     
-    for graft in grafts:
-        mergeHistory(*graft)
+    for merge in merges:
+        mergeHistory(*merge)
     
     for line in open('package-list'):
@@ -100,6 +100,6 @@
                               cwd='%s.git' % line)
     
-    for graft in grafts:
-        shutil.rmtree('%s.git' % graft[0])
+    for merge in merges:
+        shutil.rmtree('%s.git' % merge[0])
 
 if __name__ == '__main__':