/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/workingtree.py

Merge refactor of conflict code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
168
168
            raise NotImplementedError(self.__class__.__name__ + '.' + action)
169
169
        meth(tree)
170
170
 
171
 
    def action_auto(self, tree):
172
 
        raise NotImplementedError(self.action_auto)
 
171
    def describe(self):
 
172
        return 'Text conflict in %(path)s' % self.__dict__
173
173
 
174
174
    def action_done(self, tree):
175
175
        """Mark the conflict as solved once it has been handled."""