Builder: Ignore "merge commit" entries in feeds

skyjake · Apr 13, 2012 · 92138d4 · 92138d4
1 parent 5988494
commit 92138d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/distrib/builder/changes.py b/distrib/builder/changes.py
@@ -81,7 +81,7 @@ def __init__(self, fromTag, toTag):
         self.parse()
 
     def should_ignore(self, subject):
-        if subject.startswith("Merge branch"):
+        if subject.startswith("Merge branch") or subject.startswith("Merge commit"):
             # Branch merges are not listed.
             return True
         return False