On 19 June 2010 18:35, Piotr Piastucki <[email protected]> wrote: > Hi, > > One comment regarding the patch - please not that I changed: > mergeable0 = mergeable0 or (c0 and c0[0] != 'conflict') > mergeable1 = mergeable1 or (c1 and c1[0] != 'conflict') > to > mergeable0 = mergeable0 or (c0 != None and c0[0] != 'conflict') > mergeable1 = mergeable1 or (c1 != None and c1[0] != 'conflict') > in my patch purposely. > > If c0 is None then (c0 and c0[0] != 'conflict') will return None, not False. > > Please consider making this change otherwise the code will break > occasionally.
Thanks for the explanation. I've pushed a very similar change. cheers, Kai _______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
