diff hgext/graphlog.py @ 16149:6acbbb0c7381

graphlog: multiple --branch must be or'ed
author Patrick Mezard <patrick@mezard.eu>
date Wed, 22 Feb 2012 12:30:15 +0100
parents 184cc3c3e0a6
children 0424f3c7d7ac
line wrap: on
line diff
--- a/hgext/graphlog.py	Wed Feb 22 12:30:15 2012 +0100
+++ b/hgext/graphlog.py	Wed Feb 22 12:30:15 2012 +0100
@@ -254,7 +254,7 @@
         'only_merges': ('merge()', None),
         'removed':     ('removes("*")', None),
         'date':        ('date($)', None),
-        'branch':      ('branch($)', ' and '),
+        'branch':      ('branch($)', ' or '),
         'exclude':     ('not file($)', ' and '),
         'include':     ('file($)', ' and '),
         'keyword':     ('keyword($)', ' and '),