Merge 8a179079e0 into merged_master (Elements PR #1214)

This commit is contained in:
James Dorfman 2023-03-13 05:27:13 +00:00
commit 00d4bcd085

View file

@ -144,7 +144,7 @@ def get_merged_commits():
fromgui = False
fromsecp = False
if m is not None:
[date, cid, merged_cid, chain, repo, prno, trailing] = m.groups()
if chain == "Bitcoin":
@ -326,7 +326,7 @@ def main() -> None:
print("** COMMIT WE ARE REVIEWING:")
os.system(f"git -C {WQ} log -1 --pretty=full {cid}")
print()
def diff4():
os.system(f"git -C {WQ} diff {GIT_DIFF_OPTS} HEAD {cid}")