← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Aaron Bentley
  • Date: 2005-10-20 02:57:55 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: aaron.bentley@utoronto.ca-20051020025755-e03df41c52aa3156
tweaked spacing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
262
262
            elif base_contents == other_contents:
263
263
                return None
264
264
            else:
265
 
                conflict_handler.threeway_contents_conflict(this_path, 
266
 
                    this_contents, base_contents,
267
 
                    other_contents)
 
265
                conflict_handler.threeway_contents_conflict(this_path,
 
266
                                                            this_contents,
 
267
                                                            base_contents,
 
268
                                                            other_contents)
268
269
                
269
270
 
270
271
def make_merged_metadata(entry, base, other):