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__':
Index: trunk/scripts/git-migration/grafts
===================================================================
--- trunk/scripts/git-migration/grafts	(revision 1883)
+++ 	(revision )
@@ -1,10 +1,0 @@
-# The format of this file is:
-# package-that-vanished    package-it-vanished-into    n
-#
-# Where n is the number of the commit in the new repository where the
-# old package should be merged in, starting from the beginning of the
-# new package's history
-#
-# (n is translated into a revision using git rev-list --reverse
-# --skip=<n> | head -n 1)
-invirt-console-host	invirt-console	2
Index: trunk/scripts/git-migration/merges
===================================================================
--- trunk/scripts/git-migration/merges	(revision 1884)
+++ trunk/scripts/git-migration/merges	(revision 1884)
@@ -0,0 +1,10 @@
+# The format of this file is:
+# package-that-vanished    package-it-vanished-into    n
+#
+# Where n is the number of the commit in the new repository where the
+# old package should be merged in, starting from the beginning of the
+# new package's history
+#
+# (n is translated into a revision using git rev-list --reverse
+# --skip=<n> | head -n 1)
+invirt-console-host	invirt-console	2