← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
137
137
                else:
138
138
                    prefix = ' '
139
139
                to_file.write("%s %s\n" % (prefix, conflict))
140
 
            if (new_is_working_tree and show_pending
141
 
                and specific_files is None):
 
140
            if (new_is_working_tree and show_pending):
142
141
                show_pending_merges(new, to_file, short)
143
142
        finally:
144
143
            old.unlock()