diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index a4a815d863..801da968b7 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -134,6 +134,12 @@ def merge_replay( merge_data[f"{merge_tool.name}_merge_fingerprint"] != merge_fingerprint and not dont_check_fingerprints ): + # Print the merge log file + print("=====================================") + with open(log_path, "r", encoding="utf-8") as f: + print(f.read()) + print("=====================================") + raise Exception( f"fingerprints differ: after merge of {workdir} with {merge_tool}, found" + f" {merge_fingerprint} but expected "