view tests/test-merge5.out @ 3336:e44eadc92ec4

context: check self.__dict__ instead of using hasattr hasattr implicitly calls getattr, instantiating the field it is checking for.
author Brendan Cully <brendan@kublai.com>
date Wed, 11 Oct 2006 13:34:12 -0700
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes