← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

Merge bzr.dev 4734 in preparation for NEWS updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
53
53
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
54
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
55
        tree.merge_from_branch(tree2.branch)
56
 
        tree.merge_from_branch(tree3.branch)
 
56
        tree.merge_from_branch(tree3.branch, force=True)
57
57
        return tree
58
58
 
59
59
    def test_multiple_pending(self):