Mercurial > hg > gcmultimerge

comparison multimerge.py @ 67:c582522d2dcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a comment.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 12 Jul 2016 01:01:10 +0300
parents b08d159e35c7
children 42b6acc5988e
comparison
equal deleted inserted replaced
66:b08d159e35c7 67:c582522d2dcc
136 if not field in gcm_no_compare_fields and ev1[field] != ev2[field]: 136 if not field in gcm_no_compare_fields and ev1[field] != ev2[field]:
137 return False 137 return False
138 return True 138 return True
139 139
140 140
141 ###
142 ### Class for parsing and manipulating RGB colors
143 ###
141 class GCMColor(): 144 class GCMColor():
142 def __init__(self, src = None): 145 def __init__(self, src = None):
143 if src == None: 146 if src == None:
144 self.r = self.g = self.b = 0 147 self.r = self.g = self.b = 0
145 elif isinstance(src, basestring): 148 elif isinstance(src, basestring):