Oops, there was a bug in the output formatting - the last printed

values would overwrite the next value.

diff --git a/Tools/scripts/logmerge.py b/Tools/scripts/logmerge.py
index 5999c2eb534374bc4b4c8fd769c7ed5e3d52a072..f74d4f9c3b6de078994a5c8faabecc6463a29ea1 100755 (executable)
--- 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))