Fixed incremental imports by using the correct "from" command instead of "merge"...

Signed-off-by: Simon Hausmann <hausmann@kde.org>

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 06de0eae6d5e26cb8d09fffd1cebe978b1e2ea22..3e573cd7863a8b3dff67d3d3ae08b71e5ffb7eb1 100755 (executable)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/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