summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xTools/scripts/logmerge.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/scripts/logmerge.py b/Tools/scripts/logmerge.py
index 5999c2e..f74d4f9 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))