← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
225
225
        self.conflict("Three-way conflict merging %s" % filename)
226
226
 
227
227
    def finalize(self):
228
 
        if not self.ignore_zero:
 
228
        if self.conflicts == 0:
 
229
            if not self.ignore_zero:
 
230
                note("All changes applied successfully.")
 
231
        else:
229
232
            note("%d conflicts encountered." % self.conflicts)
230
233
            
231
234
def get_tree(treespec, local_branch=None):