Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.

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

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