← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-28 11:39:48 UTC
  • mfrom: (5993.1.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110628113948-nrljydmsqi6kf01c
(vila) Start implementing command help text localization (Inada Naoki)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py