← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev 4734 in preparation for NEWS updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
605
605
 
606
606
    def test_merge_force(self):
607
607
        self.tree_a.commit('empty change to allow merge to run')
608
 
        # Second merge on top if the uncommitted one
 
608
        # Second merge on top of the uncommitted one
609
609
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
610
610
 
611
611