merge-recursive: handle D/F conflict case more carefully.

diff --git a/git-p4import.py b/git-p4import.py
index 5c56cace0ef132c117e9e0f5624eaf375a5b84d2..60a758bfe3bf535733612d4a0843fb42055f4c80 100644 (file)
--- a/git-p4import.py
+++ b/git-p4import.py
@@ -193,13 +193,13 @@ def current_branch(self):
 
     def get_config(self, variable):
         try:
-            return self.git("repo-config --get %s" % variable)[0].rstrip()
+            return self.git("config --get %s" % variable)[0].rstrip()
         except:
             return None
 
     def set_config(self, variable, value):
         try:
-            self.git("repo-config %s %s"%(variable, value) )
+            self.git("config %s %s"%(variable, value) )
         except:
             die("Could not set %s to " % variable, value)