← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_cmdline.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-25 13:59:32 UTC
  • mfrom: (5321.1.119 mergetools)
  • Revision ID: pqm@pqm.ubuntu.com-20110125135932-0o8d07i3j1flp6ou
(vila) Added external merge tool management module,
 bzrlib.mergetools. (Gordon Tyler)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_cmdline.py
113
113
        self.assertAsTokens([(False, r'\\"'), (False, r'*.py')],
114
114
                            r'\\\\\" *.py')
115
115
        self.assertAsTokens([(True, u'\\\\')], u'"\\\\')
116