From 939e4c1efb9d1d598e8102f91b9b4873dad0de61 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 14 Aug 1997 23:25:20 +0000
Subject: [PATCH] Oops, there was a bug in the output formatting - the last
 printed values would overwrite the next value.

---
 Tools/scripts/logmerge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tools/scripts/logmerge.py b/Tools/scripts/logmerge.py
index 5999c2eb534..f74d4f9c3b6 100755
--- a/Tools/scripts/logmerge.py
+++ b/Tools/scripts/logmerge.py
@@ -114,8 +114,8 @@ def format_output(database):
 	if text != prevtext:
 	    if prev:
 		print sep2,
-		for (date, working_file, rev) in prev:
-		    print date, working_file
+		for (p_date, p_working_file, p_rev) in prev:
+		    print p_date, p_working_file
 		sys.stdout.writelines(prevtext)
 	    prev = []
 	prev.append((date, working_file, rev))