← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
136
136
 
137
137
        if new_is_working_tree:
138
138
            list_paths('unknown', new.unknowns(), specific_files, to_file)
139
 
            list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
 
139
            conflict_title = False
 
140
            for conflict in wt.conflicts():
 
141
                if conflict_title is False:
 
142
                    print >> to_file, "conflicts:"
 
143
                    conflict_title = True
 
144
                print >> to_file, "  %s" % conflict
140
145
        if new_is_working_tree and show_pending:
141
146
            show_pending_merges(new, to_file)
142
147
    finally: