← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
39
39
    )
40
40
 
41
41
from bzrlib.workingtree import WorkingTree
42
 
from bzrlib.i18n import gettext
43
42
""")
44
43
 
45
44
from bzrlib.registry import (
394
393
            if view_files:
395
394
                specific_files = view_files
396
395
                view_str = views.view_display_str(view_files)
397
 
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
 
396
                note("*** Ignoring files outside view. View is %s" % view_str)
398
397
 
399
398
    # Get extra trees that ought to be searched for file-ids
400
399
    extra_trees = None