/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/diff.py

Committer: Aaron Bentley
Date: 2006-07-05 04:30:20 UTC
mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
mto: This revision was merged to the branch mainline in revision 1843.
Revision ID: aaron.bentley@utoronto.ca-20060705043020-40885528b9673340

Indentation and documentation fixes

files modified:
bzrlib/delta.py

bzrlib/diff.py

bzrlib/tree.py

Show diffs side-by-side

added added

removed removed

286

286

287

287

external_diff_options

288

288

If set, use an external GNU diff and pass these options.

289

290

extra_trees

291

If set, more Trees to use for looking up file ids

289

292

"""

290

293

old_tree.lock_read()

291

294

try:

Older »