~bzr-pqm/bzr/1.17

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_merge_core.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
240
240
        os.chmod(tree.full_path(id), mode)
241
241
 
242
242
    def merge_changeset(self, merge_factory):
243
 
        conflict_handler = changeset.ExceptionConflictHandler(self.this.dir)
 
243
        conflict_handler = changeset.ExceptionConflictHandler()
244
244
        return make_merge_changeset(self.cset, self.this, self.base,
245
245
                                    self.other, conflict_handler,
246
246
                                    merge_factory)