From 136507baba7af003bc44e481a0b83015722eefab Mon Sep 17 00:00:00 2001
From: Simon Hausmann <hausmann@kde.org>
Date: Wed, 7 Feb 2007 23:09:49 +0100
Subject: [PATCH] fix incremental imports

---
 p4-fast-export.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.11.0