← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ignores.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ignores.py
213
213
    """Retrieve a list of ignores from the ignore file in a tree.
214
214
 
215
215
    :param tree: Tree to retrieve the ignore list from.
216
 
    :return: 
 
216
    :return:
217
217
    """
218
218
    ifn = tree.abspath(bzrlib.IGNORE_FILENAME)
219
219
    if tree.has_filename(ifn):