/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-06-06 01:50:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2510.
  • Revision ID: aaron.bentley@utoronto.ca-20070606015055-h01xm6jeddm630up
Rename test case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
250
250
        self.assertFalse('merge4' in [x[0] for x in 
251
251
                        merge_type_option.iter_switches()])
252
252
 
253
 
    def test_merge_move_deleted(self):
 
253
    def test_merge_other_moves_we_deleted(self):
254
254
        tree_a = self.make_branch_and_tree('A')
255
255
        tree_a.lock_write()
256
256
        self.addCleanup(tree_a.unlock)