← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-11-13 18:57:26 UTC
  • mfrom: (1185.31.9)
  • Revision ID: robertc@robertcollins.net-20051113185726-39ede10d746eee6d
Merge Johns current integration work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
228
228
 
229
229
    def finalize(self):
230
230
        if not self.ignore_zero:
231
 
            note("%d conflicts encountered.\n" % self.conflicts)
 
231
            note("%d conflicts encountered.\n", self.conflicts)
232
232
            
233
233
def get_tree(treespec, local_branch=None):
234
234
    location, revno = treespec