From: Simon Hausmann <hausmann@kde.org>
Date: Wed, 7 Feb 2007 22:09:49 +0000 (+0100)
Subject: fix incremental imports
X-Git-Url: http://crossforests.com/gitweb?a=commitdiff_plain;h=136507baba7af003bc44e481a0b83015722eefab;p=python%2Ffast-export.git

fix incremental imports
---

diff --git a/p4-fast-export.py b/p4-fast-export.py
index 06de0ea..3e573cd 100755
--- a/p4-fast-export.py
+++ b/p4-fast-export.py
@@ -88,7 +88,7 @@ def commit(details):
     gitStream.write("EOT\n\n")
 
     if len(initialParent) > 0:
-        gitStream.write("merge %s\n" % initialParent)
+        gitStream.write("from %s\n" % initialParent)
         initialParent = ""
 
     fnum = 0