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

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 14:13:48 UTC
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916141348-ymlt715bu8l2a4tu
more plurals

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
146
146
            if file_list is None:
147
147
                un_resolved, resolved = tree.auto_resolve()
148
148
                if len(un_resolved) > 0:
149
 
                    trace.note(gettext('%d conflict(s) auto-resolved.'), len(resolved))
 
149
                    trace.note(gettext('%d conflict auto-resolved.',
 
150
                        '%d conflict auto-resolved.', len(resolved)),
 
151
                        len(resolved))
150
152
                    trace.note(gettext('Remaining conflicts:'))
151
153
                    for conflict in un_resolved:
152
154
                        trace.note(unicode(conflict))