← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mergetools.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-29 21:05:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6406.
  • Revision ID: jelmer@samba.org-20111229210511-2hfcqpkn001cwzn1
Fix 'bzr shell-complete' and add a really basic test for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mergetools.py