Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@cactusbranch01
cactusbranch01 committed Apr 8, 2024
1 parent ae10ce4 commit 3629a0d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/python/diff3_pair_analysis.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def diff3_pair_analysis(
for conflict_file_match in conflict_file_matches:
conflicting_file = str(conflict_file_match)
conflict_path = os.path.join(repo_name, conflicting_file)
conflict_path_merge_attempt = os.path.join(
conflict_path_merge_attempt1 = os.path.join(
"./repos/merge_attempt1", conflict_path
)

Expand All @@ -134,7 +134,7 @@ def diff3_pair_analysis(
[
"diff3",
conflict_path_base,
conflict_path_merge_attempt,
conflict_path_merge_attempt1,
conflict_path_programmer_merge,
],
stdout=subprocess.PIPE,
Expand All @@ -149,7 +149,7 @@ def diff3_pair_analysis(
diff_results = subprocess.run(
[
"diff",
conflict_path_merge_attempt,
conflict_path_merge_attempt1,
conflict_path_programmer_merge,
],
stdout=subprocess.PIPE,
Expand Down Expand Up @@ -187,15 +187,15 @@ def diff3_pair_analysis(
"""

conflict_path = os.path.join(repo_name, conflicting_file)
conflict_path_merge_attempt = os.path.join(
conflict_path_merge_attempt2 = os.path.join(
"./repos/merge_attempt2", conflict_path
)

diff_results = subprocess.run(
[
"diff3",
conflict_path_base,
conflict_path_merge_attempt,
conflict_path_merge_attempt2,
conflict_path_programmer_merge,
],
stdout=subprocess.PIPE,
Expand All @@ -210,7 +210,7 @@ def diff3_pair_analysis(
diff_results = subprocess.run(
[
"diff",
conflict_path_merge_attempt,
conflict_path_merge_attempt2,
conflict_path_programmer_merge,
],
stdout=subprocess.PIPE,
Expand Down

0 comments on commit 3629a0d

Please sign in to comment.