← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-09-16 06:52:59 UTC
  • Revision ID: mbp@sourcefrog.net-20050916065259-714aeb37c2510699
- remove another test that tries to merge an imaginary parent

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
46
46
        b.commit('commit pointless revision with one file',
47
47
                 allow_pointless=True)
48
48
 
49
 
        b.add_pending_merge('mbp@892739123-2005-123123')
50
 
        b.commit('commit new merge with no text changes',
51
 
                 allow_pointless=False)
52
49
        
53
50
 
54
51