~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-06 18:16:56 UTC
  • mfrom: (5129.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20100406181656-dyrvlx555j1sfv9n
(GaryvdM) Fix spelling of APPORT_DISABLE in crash doc string.

Show diffs side-by-side

added added

removed removed

Lines of Context: