Skip to content

Commit

Permalink
More info
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schesch committed May 5, 2024
1 parent db6a44b commit 4d6c8ac
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/python/replay_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ def merge_replay(
raise Exception(
f"fingerprints differ: after merge of {workdir} with {merge_tool}, found"
+ f" {merge_fingerprint} but expected "
+ f"{merge_data[f'{merge_tool.name}_merge_fingerprint']}"
+ f"{merge_data[f'{merge_tool.name}_merge_fingerprint']} at log path {log_path}"
+ f" and repo path {repo.local_repo_path}"
)

if merge_result not in (
Expand Down

0 comments on commit 4d6c8ac

Please sign in to comment.