/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert J. Tanner
  • Date: 2009-04-08 03:34:31 UTC
  • mfrom: (4266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4267.
  • Revision ID: tanner@real-time.com-20090408033431-draj0u7nd9bbby53
Merge 1.14rc1 back bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
546
546
        :param working_tree: The working tree to apply the merge to
547
547
        :param this_tree: The local tree in the merge operation
548
548
        :param base_tree: The common tree in the merge operation
549
 
        :param other_tree: The other other tree to merge changes from
 
549
        :param other_tree: The other tree to merge changes from
550
550
        :param interesting_ids: The file_ids of files that should be
551
551
            participate in the merge.  May not be combined with
552
552
            interesting_files.