← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Committer: Martin Pool
Date: 2005-12-05 12:04:37 UTC
mfrom: (1185.50.18 bzr-jam-integration)
mto: (1185.74.1 bzr.dev (Main development branch)) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1505.1.20 bzr-bound-branch) (1685.1.1 bzr-encoding)
mto: This revision was merged to the branch mainline in revision 1519.
Revision ID: mbp@sourcefrog.net-20051205120437-b6b3e28a9ea0fae5

[merge] john

Show diffs side-by-side

added added

removed removed

bzrlib/merge.py

226

226

self.conflict("Three-way conflict merging %s" % filename)

227

227

228

228

def finalize(self):

229

if not self.ignore_zero:

229

if self.conflicts == 0:

230

if not self.ignore_zero:

231

note("All changes applied successfully.")

232

else:

230

233

note("%d conflicts encountered." % self.conflicts)

231

234

232

235

def get_tree(treespec, local_branch=None):

Older »