← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_find_merge_base.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_find_merge_base.py
30
30
        b_tree.commit(message='baz', allow_pointless=True)
31
31
        r = self.run_bzr('find-merge-base b a')[0]
32
32
        self.assertEqual(q, r)
33
 
        
 
33
 
34
34
    def test_find_null_merge_base(self):
35
35
        tree = self.make_branch_and_tree('foo')
36
36
        tree.commit('message')