Merge ../AST-Merging-Evaluation-branch-main into update-plumelib-lift…

…-exit
benedikt-schesch · Sep 16, 2024 · ba2b02e · ba2b02e
2 parents ec93f42 + 32ec0cf
commit ba2b02e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/python/repo.py b/src/python/repo.py
@@ -547,7 +547,7 @@ def merge(
         command = [
             "src/scripts/run_with_timeout.sh",
             str(timeout),
-            f"src/scripts/merge_tools/{tool.name}.sh {self.local_repo_path} {LEFT_BRANCH_NAME} {RIGHT_BRANCH_NAME}",
+            f"src/scripts/merge_tools/{tool.name}.sh {self.local_repo_path.resolve()} {LEFT_BRANCH_NAME} {RIGHT_BRANCH_NAME}",
         ]
         p = subprocess.run(
             command,