← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2007-07-12 17:46:52 UTC
  • mto: This revision was merged to the branch mainline in revision 2617.
  • Revision ID: abentley@panoramicfeedback.com-20070712174652-vof6knvyoca27gsk
Avoid redundant conflict check

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
410
410
            for conflict in self.cooked_conflicts:
411
411
                warning(conflict)
412
412
            self.pp.next_phase()
413
 
            results = self.tt.apply()
 
413
            results = self.tt.apply(no_conflicts=True)
414
414
            self.write_modified(results)
415
415
            try:
416
416
                working_tree.add_conflicts(self.cooked_conflicts)