black

Author: harminius

mergin/merginproject.py

@@ -839,7 +839,9 @@ def update_with_rebase(self, path, src, dest, basefile, temp_dir, user_name):
         dest_lp = long_path(dest)
         basefile_lp = long_path(basefile)
 
-        server_diff = long_path(self.fpath(f"{path}-server_diff", temp_dir))  # diff between server file and local basefile
+        server_diff = long_path(
+            self.fpath(f"{path}-server_diff", temp_dir)
+        )  # diff between server file and local basefile
         local_diff = long_path(self.fpath(f"{path}-local_diff", temp_dir))
 
         # temporary backup of file pulled from server for recovery