← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 15:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916153758-y936k3hysjc1tphy
update tests

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 auto-resolved.',
150
 
                        '%d conflict auto-resolved.', len(resolved)),
 
149
                    trace.note(ngettext('%d conflict auto-resolved.',
 
150
                        '%d conflicts auto-resolved.', len(resolved)),
151
151
                        len(resolved))
152
152
                    trace.note(gettext('Remaining conflicts:'))
153
153
                    for conflict in un_resolved: